From d26ab593758ffa80954a88373516ecddcd0f21da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 12 Jul 2024 08:42:57 +0200 Subject: [PATCH 01/14] Refs #21349. Remove old functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../ConfigurationPubSubTypes.hpp | 17 - .../content_filter/HelloWorldPubSubTypes.hpp | 17 - .../HelloWorldPubSubTypes.hpp | 17 - .../HelloWorldPubSubTypes.hpp | 17 - .../HelloWorldPubSubTypes.hpp | 17 - .../HelloWorldPubSubTypes.hpp | 17 - examples/cpp/dds/Keys/samplePubSubTypes.hpp | 17 - .../LoanableHelloWorldPubSubTypes.hpp | 17 - .../LoanableHelloWorldPubSubTypes.hpp | 17 - .../DeliveryMechanismsPubSubTypes.hpp | 17 - .../cpp/delivery_mechanisms/PubSubApp.cpp | 2 +- .../cpp/delivery_mechanisms/PublisherApp.cpp | 2 +- .../cpp/delivery_mechanisms/SubscriberApp.cpp | 2 +- .../HelloWorldPubSubTypes.hpp | 17 - .../flow_control/FlowControlPubSubTypes.hpp | 17 - .../cpp/hello_world/HelloWorldPubSubTypes.hpp | 17 - .../types/CalculatorPubSubTypes.hpp | 34 - .../cpp/security/HelloWorldPubSubTypes.hpp | 17 - .../HelloWorldPubSubTypes.hpp | 17 - include/fastdds/dds/topic/TopicDataType.hpp | 36 +- include/fastdds/dds/topic/TypeSupport.hpp | 27 - .../dynamic_types/DynamicPubSubType.hpp | 25 +- .../dds_xtypes_typeobjectPubSubTypes.hpp | 1653 +----- .../detail/TypeLookupTypesPubSubTypes.hpp | 102 - .../detail/rpc_typesPubSubTypes.hpp | 102 - src/cpp/fastdds/publisher/DataWriterImpl.cpp | 7 +- src/cpp/fastdds/topic/TopicDataType.cpp | 22 - .../dynamic_types/DynamicPubSubType.cpp | 6 - .../rtps/monitor-service/MonitorService.cpp | 4 +- .../types/monitorservice_typesPubSubTypes.hpp | 119 - src/cpp/statistics/types/typesPubSubTypes.hpp | 238 - .../common/DDSBlackboxTestsFindTopic.cpp | 6 +- test/blackbox/types/Data1mbPubSubTypes.hpp | 17 - test/blackbox/types/Data64kbPubSubTypes.hpp | 17 - test/blackbox/types/FixedSizedPubSubTypes.hpp | 17 - test/blackbox/types/HelloWorldPubSubTypes.hpp | 17 - .../types/KeyedData1mbPubSubTypes.hpp | 17 - .../types/KeyedHelloWorldPubSubTypes.hpp | 17 - test/blackbox/types/StringTestPubSubTypes.hpp | 17 - .../types/TestRegression3361PubSubTypes.hpp | 17 - .../types/UnboundedHelloWorldPubSubTypes.hpp | 17 - .../types/core/core_typesPubSubTypes.hpp | 374 -- .../monitorservice_typesPubSubTypes.hpp | 119 - .../types/statistics/typesPubSubTypes.hpp | 238 - test/dds-types-test/aliasesPubSubTypes.hpp | 425 -- .../dds-types-test/annotationsPubSubTypes.hpp | 51 - test/dds-types-test/appendablePubSubTypes.hpp | 323 -- test/dds-types-test/arraysPubSubTypes.hpp | 1780 +------ test/dds-types-test/bitsetsPubSubTypes.hpp | 17 - test/dds-types-test/constantsPubSubTypes.hpp | 51 - .../declarationsPubSubTypes.hpp | 102 - .../enumerationsPubSubTypes.hpp | 51 - test/dds-types-test/externalPubSubTypes.hpp | 459 -- test/dds-types-test/finalPubSubTypes.hpp | 323 -- .../helpers/basic_inner_typesPubSubTypes.hpp | 34 - .../basic_inner_typesTypeObjectSupport.cxx | 2 +- .../dds-types-test/inheritancePubSubTypes.hpp | 136 - .../inheritanceTypeObjectSupport.cxx | 6 +- test/dds-types-test/keyPubSubTypes.hpp | 289 -- test/dds-types-test/mapsPubSubTypes.hpp | 4498 +---------------- test/dds-types-test/member_idPubSubTypes.hpp | 204 - test/dds-types-test/mutablePubSubTypes.hpp | 323 -- test/dds-types-test/optionalPubSubTypes.hpp | 1383 +---- test/dds-types-test/primitivesPubSubTypes.hpp | 357 -- .../relative_path_includePubSubTypes.hpp | 17 - test/dds-types-test/sequencesPubSubTypes.hpp | 476 -- test/dds-types-test/stringsPubSubTypes.hpp | 102 - test/dds-types-test/structuresPubSubTypes.hpp | 578 --- test/dds-types-test/unionsPubSubTypes.hpp | 697 --- test/performance/latency/LatencyTestTypes.hpp | 30 +- .../throughput/ThroughputTypes.hpp | 32 +- test/profiling/MemoryTestTypes.cpp | 42 +- test/profiling/MemoryTestTypes.h | 10 - .../allocations/AllocTestTypePubSubTypes.hpp | 17 - .../dds/participant/ParticipantTests.cpp | 31 - .../dds/publisher/DataWriterTests.cpp | 77 - .../unittest/dds/publisher/PublisherTests.cpp | 31 - test/unittest/dds/status/ListenerTests.cpp | 6 +- .../dds/subscriber/DataReaderHistoryTests.cpp | 19 +- .../dds/subscriber/DataReaderTests.cpp | 26 - .../dds/subscriber/FooBoundedTypeSupport.hpp | 16 +- .../dds/subscriber/FooTypeSupport.hpp | 16 +- .../dds/subscriber/SubscriberTests.cpp | 13 - .../topic/DDSSQLFilter/DDSSQLFilterTests.cpp | 4 +- .../ContentFilterTestTypePubSubTypes.hpp | 34 - test/unittest/dds/topic/TopicTests.cpp | 6 +- .../gen/ComprehensiveTypePubSubTypes.hpp | 51 - ...sDomainParticipantStatusQueryableTests.cpp | 6 +- .../dds/StatisticsDomainParticipantTests.cpp | 6 +- 89 files changed, 98 insertions(+), 16585 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index f5e4f1ca1f0..e459174ab5d 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -52,13 +52,6 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ConfigurationPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index 75830b9c78b..a22a6f25267 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index 9ef5e577788..2779a0ad901 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -52,13 +52,6 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~samplePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index 3aed39a714c..fe0b9d78efb 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -85,13 +85,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~LoanableHelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -101,12 +94,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -133,10 +120,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index 3aed39a714c..fe0b9d78efb 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -85,13 +85,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~LoanableHelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -101,12 +94,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -133,10 +120,6 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 6fd9210c569..5a946a76447 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -85,13 +85,6 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~DeliveryMechanismsPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -101,12 +94,6 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -133,10 +120,6 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.cpp b/examples/cpp/delivery_mechanisms/PubSubApp.cpp index eab6be79312..3e2ac3c429b 100644 --- a/examples/cpp/delivery_mechanisms/PubSubApp.cpp +++ b/examples/cpp/delivery_mechanisms/PubSubApp.cpp @@ -68,7 +68,7 @@ PubSubApp::PubSubApp( , stop_(false) { // Check that the generated type fulfils example constraints: it is plain and bounded - if (!type_->is_plain() || !type_->is_bounded()) + if (!type_->is_plain(eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION) || !type_->is_bounded()) { throw std::runtime_error( "Example generated type does not fulfil the example constraints: it is not plain and/or bounded"); diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.cpp b/examples/cpp/delivery_mechanisms/PublisherApp.cpp index ea100372f94..f3bf75413c6 100644 --- a/examples/cpp/delivery_mechanisms/PublisherApp.cpp +++ b/examples/cpp/delivery_mechanisms/PublisherApp.cpp @@ -60,7 +60,7 @@ PublisherApp::PublisherApp( , stop_(false) { // Check that the generated type fulfils example constraints: it is plain and bounded - if (!type_->is_plain() || !type_->is_bounded()) + if (!type_->is_plain(eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION) || !type_->is_bounded()) { throw std::runtime_error( "Example generated type does not fulfil the example constraints: it is not plain and/or bounded"); diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp index 1c2a7d4d520..05751563b2d 100644 --- a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp +++ b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp @@ -59,7 +59,7 @@ SubscriberApp::SubscriberApp( , stop_(false) { // Check that the generated type fulfils example constraints: it is plain and bounded - if (!type_->is_plain() || !type_->is_bounded()) + if (!type_->is_plain(eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION) || !type_->is_bounded()) { throw std::runtime_error( "Example generated type does not fulfil the example constraints: it is not plain and/or bounded"); diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index 65c48d35fd6..591cc6f5cd8 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -52,13 +52,6 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FlowControlPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index 946ca0be8a8..1a61dc56081 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -52,13 +52,6 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~CalculatorRequestTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -143,13 +126,6 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CalculatorReplyTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,12 +135,6 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -191,10 +161,6 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index 556d4c05ecf..b0e890c5ce2 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index ea1173f5476..9748813378e 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -71,20 +71,6 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual ~TopicDataType(); - /** - * Serialize method, it should be implemented by the user, since it is abstract. - * It is VERY IMPORTANT that the user sets the SerializedPayload length correctly. - * - * @param [in] data Pointer to the data - * @param [out] payload Pointer to the payload - * @return True if correct. - */ - // TODO(jlbueno) Remove when Fast DDS-Gen is updated - // FASTDDS_TODO_BEFORE(3, 0, "Remove this overload") - FASTDDS_EXPORTED_API virtual bool serialize( - const void* const data, - fastdds::rtps::SerializedPayload_t* payload) = 0; - /** * Serialize method, it should be implemented by the user, since it is abstract. If not implemented, this method * will call the serialize method in which the topic data representation is not considered. @@ -98,7 +84,7 @@ class TopicDataType FASTDDS_EXPORTED_API virtual bool serialize( const void* const data, fastdds::rtps::SerializedPayload_t* payload, - DataRepresentationId_t data_representation); + DataRepresentationId_t data_representation) = 0; /** * Deserialize method, it should be implemented by the user, since it is abstract. @@ -111,16 +97,6 @@ class TopicDataType fastdds::rtps::SerializedPayload_t* payload, void* data) = 0; - /*! - * @brief Returns a function which can be used to calculate the serialized size of the provided data. - * - * @param [in] data Pointer to data. - * @return Functor which calculates the serialized size of the data. - */ - // FASTDDS_TODO_BEFORE(3, 0, "Remove this overload") - FASTDDS_EXPORTED_API virtual std::function getSerializedSizeProvider( - const void* const data) = 0; - /*! * @brief Returns a function which can be used to calculate the serialized size of the provided data. * @@ -130,7 +106,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual std::function getSerializedSizeProvider( const void* const data, - DataRepresentationId_t data_representation); + DataRepresentationId_t data_representation) = 0; /** * Create a Data Type. @@ -219,14 +195,6 @@ class TopicDataType return false; } - /** - * Checks if the type is plain when using default encoding. - */ - FASTDDS_EXPORTED_API virtual inline bool is_plain() const - { - return false; - } - /** * Checks if the type is plain when using a specific encoding. */ diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index f8d4ad5814a..b58b50c0b32 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -139,13 +139,6 @@ class TypeSupport : public std::shared_ptr * @return true if it is serialized correctly, false if not */ - FASTDDS_EXPORTED_API virtual bool serialize( - const void* const data, - fastdds::rtps::SerializedPayload_t* payload) - { - return serialize(data, payload, DEFAULT_DATA_REPRESENTATION); - } - /** * @brief Serializes the data * @@ -170,18 +163,6 @@ class TypeSupport : public std::shared_ptr fastdds::rtps::SerializedPayload_t* payload, void* data); - /*! - * @brief Returns a function which can be used to calculate the serialized size of the provided data. - * - * @param [in] data Pointer to data. - * @return Functor which calculates the serialized size of the data. - */ - FASTDDS_EXPORTED_API virtual std::function get_serialized_size_provider( - const void* const data) - { - return get_serialized_size_provider(data, DEFAULT_DATA_REPRESENTATION); - } - /*! * @brief Returns a function which can be used to calculate the serialized size of the provided data. * @@ -260,14 +241,6 @@ class TypeSupport : public std::shared_ptr return get()->is_bounded(); } - /** - * Checks if the type is plain when using default encoding. - */ - FASTDDS_EXPORTED_API virtual inline bool is_plain() const - { - return is_plain(DataRepresentationId_t::XCDR_DATA_REPRESENTATION); - } - /** * Checks if the type is plain when using a specific encoding. */ diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp index 3746ad287ff..331f5c3da25 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp @@ -96,34 +96,19 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType /* * Provide a functor that calculates a specified object serialized size - * @param data object whose payload footprint to calculate + * @param[in] data object whose payload footprint to calculate + * @param [in] data_representation Representation that should be used for calculating the serialized size. * @return functor that calculates the size */ - // FASTDDS_TODO_BEFORE(3, 0, "Remove this overload") - FASTDDS_EXPORTED_API std::function getSerializedSizeProvider( - const void* const data) override; - FASTDDS_EXPORTED_API std::function getSerializedSizeProvider( const void* const data, DataRepresentationId_t data_representation) override; /* * Serialize an object into a given payload - * @param data object to serialize - * @param payload @ref eprosima::fastdds::rtps::SerializedPayload_t to fill in - * @return bool specifying success - */ - FASTDDS_EXPORTED_API bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - /* - * Serialize an object into a given payload - * @param data object to serialize - * @param payload @ref eprosima::fastdds::rtps::SerializedPayload_t to fill in + * @param[in] data object to serialize + * @param[out] payload @ref eprosima::fastdds::rtps::SerializedPayload_t to fill in + * @param [in] data_representation Representation that should be used to encode the data into the payload. * @return bool specifying success */ FASTDDS_EXPORTED_API bool serialize( diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index fd95cb9b942..62f149cfe71 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -176,13 +176,6 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StringSTypeDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -192,12 +185,6 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -224,10 +211,6 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -322,13 +305,6 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StringLTypeDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -338,12 +314,6 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -370,10 +340,6 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -435,13 +401,6 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~PlainCollectionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -451,12 +410,6 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -483,10 +436,6 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -526,13 +475,6 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~PlainSequenceSElemDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -542,12 +484,6 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -574,10 +510,6 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -617,13 +549,6 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~PlainSequenceLElemDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -633,12 +558,6 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -665,10 +584,6 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -708,13 +623,6 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~PlainArraySElemDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -724,12 +632,6 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -756,10 +658,6 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -799,13 +697,6 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~PlainArrayLElemDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -815,12 +706,6 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -847,10 +732,6 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -890,13 +771,6 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~PlainMapSTypeDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -906,12 +780,6 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -938,10 +806,6 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -981,13 +845,6 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~PlainMapLTypeDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -997,12 +854,6 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1029,10 +880,6 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1072,13 +919,6 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~StronglyConnectedComponentIdPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1088,12 +928,6 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1120,10 +954,6 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1163,13 +993,6 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ExtendedTypeDefnPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1179,12 +1002,6 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1211,10 +1028,6 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1254,13 +1067,6 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~DummyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1270,12 +1076,6 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1302,10 +1102,6 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1368,13 +1164,6 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ExtendedAnnotationParameterValuePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1384,12 +1173,6 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1416,10 +1199,6 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1460,13 +1239,6 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~AppliedAnnotationParameterPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1476,12 +1248,6 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1508,10 +1274,6 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1552,13 +1314,6 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AppliedAnnotationPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1568,12 +1323,6 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1600,10 +1349,6 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1644,13 +1389,6 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~AppliedVerbatimAnnotationPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1660,12 +1398,6 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1692,10 +1424,6 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1735,13 +1463,6 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~AppliedBuiltinMemberAnnotationsPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1751,12 +1472,6 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1783,10 +1498,6 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1826,13 +1537,6 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~CommonStructMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1842,12 +1546,6 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1874,10 +1572,6 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1917,13 +1611,6 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteMemberDetailPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1933,12 +1620,6 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1965,10 +1646,6 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2041,13 +1718,6 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalMemberDetailPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2057,12 +1727,6 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2089,10 +1753,6 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2154,13 +1814,6 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteStructMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2170,12 +1823,6 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2202,10 +1849,6 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2246,13 +1889,6 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalStructMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2262,12 +1898,6 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2294,10 +1924,6 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2338,13 +1964,6 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~AppliedBuiltinTypeAnnotationsPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2354,12 +1973,6 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2386,10 +1999,6 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2429,13 +2038,6 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalTypeDetailPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2445,12 +2047,6 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2477,10 +2073,6 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2538,13 +2130,6 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~CompleteTypeDetailPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2554,12 +2139,6 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2586,10 +2165,6 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2629,13 +2204,6 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteStructHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2645,12 +2213,6 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2677,10 +2239,6 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2720,13 +2278,6 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalStructHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2736,12 +2287,6 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2768,10 +2313,6 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2811,13 +2352,6 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~CompleteStructTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2827,12 +2361,6 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2859,10 +2387,6 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2902,13 +2426,6 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalStructTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2918,12 +2435,6 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2950,10 +2461,6 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2994,13 +2501,6 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CommonUnionMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3010,12 +2510,6 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3042,10 +2536,6 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3085,13 +2575,6 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CompleteUnionMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3101,12 +2584,6 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3133,10 +2610,6 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3177,13 +2650,6 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MinimalUnionMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3193,12 +2659,6 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3225,10 +2685,6 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3269,13 +2725,6 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~CommonDiscriminatorMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3285,12 +2734,6 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3317,10 +2760,6 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3360,13 +2799,6 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~CompleteDiscriminatorMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3376,12 +2808,6 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3408,10 +2834,6 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3451,13 +2873,6 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MinimalDiscriminatorMemberPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3467,12 +2882,6 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3499,10 +2908,6 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3542,13 +2947,6 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CompleteUnionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3558,12 +2956,6 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3590,10 +2982,6 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3633,13 +3021,6 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MinimalUnionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3649,12 +3030,6 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3681,10 +3056,6 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3724,13 +3095,6 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteUnionTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3740,12 +3104,6 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3772,10 +3130,6 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3815,13 +3169,6 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalUnionTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3831,12 +3178,6 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3863,10 +3204,6 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3906,13 +3243,6 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~CommonAnnotationParameterPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3922,12 +3252,6 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3954,10 +3278,6 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3997,13 +3317,6 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~CompleteAnnotationParameterPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4013,12 +3326,6 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4045,10 +3352,6 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4089,13 +3392,6 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MinimalAnnotationParameterPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4105,12 +3401,6 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4137,10 +3427,6 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4181,13 +3467,6 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~CompleteAnnotationHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4197,12 +3476,6 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4229,10 +3502,6 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4272,13 +3541,6 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MinimalAnnotationHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4288,12 +3550,6 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4320,10 +3576,6 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4363,13 +3615,6 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~CompleteAnnotationTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4379,12 +3624,6 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4411,10 +3650,6 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4454,13 +3689,6 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~MinimalAnnotationTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4470,12 +3698,6 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4502,10 +3724,6 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4545,13 +3763,6 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CommonAliasBodyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4561,12 +3772,6 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4593,10 +3798,6 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4636,13 +3837,6 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteAliasBodyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4652,12 +3846,6 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4684,10 +3872,6 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4727,13 +3911,6 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalAliasBodyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4743,12 +3920,6 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4775,10 +3946,6 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4818,13 +3985,6 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CompleteAliasHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4834,12 +3994,6 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4866,10 +4020,6 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4909,13 +4059,6 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MinimalAliasHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4925,12 +4068,6 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4957,10 +4094,6 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5000,13 +4133,6 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteAliasTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5016,12 +4142,6 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5048,10 +4168,6 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5091,13 +4207,6 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalAliasTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5107,12 +4216,6 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5139,10 +4242,6 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5182,13 +4281,6 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~CompleteElementDetailPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5198,12 +4290,6 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5230,10 +4316,6 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5273,13 +4355,6 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~CommonCollectionElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5289,12 +4364,6 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5321,10 +4390,6 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5364,13 +4429,6 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~CompleteCollectionElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5380,12 +4438,6 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5412,10 +4464,6 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5455,13 +4503,6 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MinimalCollectionElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5471,12 +4512,6 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5503,10 +4538,6 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5579,13 +4610,6 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~CommonCollectionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5595,12 +4619,6 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5627,10 +4645,6 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5692,13 +4706,6 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~CompleteCollectionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5708,12 +4715,6 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5740,10 +4741,6 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5783,13 +4780,6 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MinimalCollectionHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5799,12 +4789,6 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5831,10 +4815,6 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5874,13 +4854,6 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteSequenceTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5890,12 +4863,6 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5922,10 +4889,6 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5965,13 +4928,6 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalSequenceTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5981,12 +4937,6 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6013,10 +4963,6 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6056,13 +5002,6 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CommonArrayHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6072,12 +5011,6 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6104,10 +5037,6 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6147,13 +5076,6 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CompleteArrayHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6163,12 +5085,6 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6195,10 +5111,6 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6238,13 +5150,6 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MinimalArrayHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6254,12 +5159,6 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6286,10 +5185,6 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6329,13 +5224,6 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteArrayTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6345,12 +5233,6 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6377,10 +5259,6 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6420,13 +5298,6 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalArrayTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6436,12 +5307,6 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6468,10 +5333,6 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6511,13 +5372,6 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteMapTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6527,12 +5381,6 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6559,10 +5407,6 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6602,13 +5446,6 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalMapTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6618,12 +5455,6 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6650,10 +5481,6 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6694,13 +5521,6 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~CommonEnumeratedLiteralPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6710,12 +5530,6 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6742,10 +5556,6 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6785,13 +5595,6 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~CompleteEnumeratedLiteralPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6801,12 +5604,6 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6833,10 +5630,6 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6877,13 +5670,6 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MinimalEnumeratedLiteralPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6893,12 +5679,6 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6925,10 +5705,6 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7002,13 +5778,6 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~CommonEnumeratedHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7018,12 +5787,6 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7050,10 +5813,6 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7115,13 +5874,6 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~CompleteEnumeratedHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7131,12 +5883,6 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7163,10 +5909,6 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7206,13 +5948,6 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MinimalEnumeratedHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7222,12 +5957,6 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7254,10 +5983,6 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7297,27 +6022,14 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~CompleteEnumeratedTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eprosima::fastdds::rtps::SerializedPayload_t* payload, + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -7345,10 +6057,6 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7388,13 +6096,6 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~MinimalEnumeratedTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7404,12 +6105,6 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7436,10 +6131,6 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7479,13 +6170,6 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CommonBitflagPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7495,12 +6179,6 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7527,10 +6205,6 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7570,13 +6244,6 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteBitflagPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7586,12 +6253,6 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7618,10 +6279,6 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7662,13 +6319,6 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalBitflagPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7678,12 +6328,6 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7710,10 +6354,6 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7787,13 +6427,6 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CommonBitmaskHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7803,12 +6436,6 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7835,10 +6462,6 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7902,13 +6525,6 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~CompleteBitmaskTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7918,12 +6534,6 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7950,10 +6560,6 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7993,13 +6599,6 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MinimalBitmaskTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8009,12 +6608,6 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8041,10 +6634,6 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8084,13 +6673,6 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CommonBitfieldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8100,12 +6682,6 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8132,10 +6708,6 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8175,13 +6747,6 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CompleteBitfieldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8191,12 +6756,6 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8223,10 +6782,6 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8267,13 +6822,6 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalBitfieldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8283,12 +6831,6 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8315,10 +6857,6 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8359,13 +6897,6 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteBitsetHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8375,12 +6906,6 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8407,10 +6932,6 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8450,13 +6971,6 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalBitsetHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8466,12 +6980,6 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8498,10 +7006,6 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8541,13 +7045,6 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~CompleteBitsetTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8557,12 +7054,6 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8589,10 +7080,6 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8632,13 +7119,6 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MinimalBitsetTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8648,12 +7128,6 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8680,10 +7154,6 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8723,13 +7193,6 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~CompleteExtendedTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8739,12 +7202,6 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8771,10 +7228,6 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8815,13 +7268,6 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MinimalExtendedTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8831,12 +7277,6 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8863,10 +7303,6 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8910,13 +7346,6 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~TypeIdentifierTypeObjectPairPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8926,12 +7355,6 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8958,10 +7381,6 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9002,13 +7421,6 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~TypeIdentifierPairPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9018,12 +7430,6 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9050,10 +7456,6 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9094,13 +7496,6 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~TypeIdentfierWithSizePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9110,12 +7505,6 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9142,10 +7531,6 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9186,13 +7571,6 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~TypeIdentifierWithDependenciesPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9202,12 +7580,6 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9234,10 +7606,6 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9278,13 +7646,6 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~TypeInformationPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9294,12 +7655,6 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9326,10 +7681,6 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index 7361e8a76da..dc34b6a3387 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -64,13 +64,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_getTypes_InPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -80,12 +73,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -112,10 +99,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -155,13 +138,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_getTypes_OutPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -171,12 +147,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -203,10 +173,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -247,13 +213,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_getTypeDependencies_InPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -263,12 +222,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -295,10 +248,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -338,13 +287,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_getTypeDependencies_OutPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -354,12 +296,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -386,10 +322,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -431,13 +363,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_RequestPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -447,12 +372,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -479,10 +398,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -523,13 +438,6 @@ namespace builtin eProsima_user_DllExport ~TypeLookup_ReplyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -539,12 +447,6 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -571,10 +473,6 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index 6d81093423e..ed5dc81faea 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -93,13 +93,6 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~EntityId_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -109,12 +102,6 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -141,10 +128,6 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -239,13 +222,6 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~GUID_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -255,12 +231,6 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -287,10 +257,6 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -385,13 +351,6 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceNumber_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -401,12 +360,6 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -433,10 +386,6 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -531,13 +480,6 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SampleIdentityPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -547,12 +489,6 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -579,10 +515,6 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -651,13 +583,6 @@ namespace rpc eProsima_user_DllExport ~RequestHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -667,12 +592,6 @@ namespace rpc eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -699,10 +618,6 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -775,13 +690,6 @@ namespace rpc eProsima_user_DllExport ~ReplyHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -791,12 +699,6 @@ namespace rpc eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -823,10 +725,6 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index 2eedc826720..c5330fd4273 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -836,9 +836,10 @@ InstanceHandle_t DataWriterImpl::do_register_instance( assert(nullptr != payload); if (0 == payload->length || nullptr == payload->data) { - uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : type_->getSerializedSizeProvider(key)(); + uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : type_->getSerializedSizeProvider(key, + data_representation_)(); payload->reserve(size); - if (!type_->serialize(key, payload)) + if (!type_->serialize(key, payload, data_representation_)) { EPROSIMA_LOG_WARNING(DATA_WRITER, "Key data serialization failed"); @@ -1015,7 +1016,7 @@ ReturnCode_t DataWriterImpl::perform_create_new_change( bool was_loaned = check_and_remove_loan(data, payload); if (!was_loaned) { - if (!get_free_payload_from_pool(type_->getSerializedSizeProvider(data), payload)) + if (!get_free_payload_from_pool(type_->getSerializedSizeProvider(data, data_representation_), payload)) { return RETCODE_OUT_OF_RESOURCES; } diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp index 53125b55a20..05102defca0 100644 --- a/src/cpp/fastdds/topic/TopicDataType.cpp +++ b/src/cpp/fastdds/topic/TopicDataType.cpp @@ -42,28 +42,6 @@ TopicDataType::~TopicDataType() { } -bool TopicDataType::serialize( - const void* const data, - fastdds::rtps::SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - - static_cast(data_representation); - return serialize(data, payload); -} - -std::function TopicDataType::getSerializedSizeProvider( - const void* const data, - DataRepresentationId_t data_representation) -{ - static_cast(data); - static_cast(data_representation); - return []() - { - return 0; - }; -} - } /* namespace dds */ } /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp index fb64b11be5b..66291c31d92 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp @@ -148,12 +148,6 @@ bool DynamicPubSubType::getKey( return true; } -std::function DynamicPubSubType::getSerializedSizeProvider( - const void* const data) -{ - return getSerializedSizeProvider(data, DEFAULT_DATA_REPRESENTATION); -} - std::function DynamicPubSubType::getSerializedSizeProvider( const void* const data, DataRepresentationId_t data_representation) diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp index d2342534215..4e06d015034 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp @@ -381,7 +381,7 @@ bool MonitorService::add_change( handle); if (nullptr != change) { - uint32_t cdr_size = type_.getSerializedSizeProvider(&status_data)(); + uint32_t cdr_size = type_.getSerializedSizeProvider(&status_data, fastdds::dds::DEFAULT_DATA_REPRESENTATION)(); if (!status_writer_payload_pool_->get_payload(cdr_size, change->serializedPayload)) { status_writer_history_->release_change(change); @@ -393,7 +393,7 @@ bool MonitorService::add_change( { CDRMessage_t aux_msg(change->serializedPayload); - if (!type_.serialize(&status_data, &change->serializedPayload)) + if (!type_.serialize(&status_data, &change->serializedPayload, fastdds::dds::DEFAULT_DATA_REPRESENTATION)) { EPROSIMA_LOG_ERROR(MONITOR_SERVICE, "Serialization failed"); status_writer_history_->release_change(change); diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index 966a6a459c8..951c853eedf 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -59,13 +59,6 @@ namespace eprosima eProsima_user_DllExport ~ConnectionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -75,12 +68,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -107,10 +94,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -150,13 +133,6 @@ namespace eprosima eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -166,12 +142,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -198,10 +168,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -241,13 +207,6 @@ namespace eprosima eProsima_user_DllExport ~BaseStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -257,12 +216,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -289,10 +242,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -333,13 +282,6 @@ namespace eprosima eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -349,12 +291,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -381,10 +317,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -424,13 +356,6 @@ namespace eprosima eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -440,12 +365,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -472,10 +391,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -515,13 +430,6 @@ namespace eprosima eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -531,12 +439,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -563,10 +465,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -623,13 +521,6 @@ namespace eprosima eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -639,12 +530,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -671,10 +556,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index fb99b8c567d..77c37085ca3 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -60,13 +60,6 @@ namespace eprosima eProsima_user_DllExport ~EntityId_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -76,12 +69,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -108,10 +95,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -151,13 +134,6 @@ namespace eprosima eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -167,12 +143,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -199,10 +169,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -242,13 +208,6 @@ namespace eprosima eProsima_user_DllExport ~GUID_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -258,12 +217,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -290,10 +243,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -333,13 +282,6 @@ namespace eprosima eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -349,12 +291,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -381,10 +317,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -424,13 +356,6 @@ namespace eprosima eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -440,12 +365,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -472,10 +391,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -515,13 +430,6 @@ namespace eprosima eProsima_user_DllExport ~Locator_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -531,12 +439,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -563,10 +465,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -607,13 +505,6 @@ namespace eprosima eProsima_user_DllExport ~DiscoveryTimePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -623,12 +514,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -655,10 +540,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -698,13 +579,6 @@ namespace eprosima eProsima_user_DllExport ~EntityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -714,12 +588,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -746,10 +614,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -789,13 +653,6 @@ namespace eprosima eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -805,12 +662,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -837,10 +688,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -880,13 +727,6 @@ namespace eprosima eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -896,12 +736,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -928,10 +762,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -971,13 +801,6 @@ namespace eprosima eProsima_user_DllExport ~WriterReaderDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -987,12 +810,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1019,10 +836,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1062,13 +875,6 @@ namespace eprosima eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1078,12 +884,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1110,10 +910,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1153,13 +949,6 @@ namespace eprosima eProsima_user_DllExport ~EntityDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1169,12 +958,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1201,10 +984,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1244,13 +1023,6 @@ namespace eprosima eProsima_user_DllExport ~PhysicalDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1260,12 +1032,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1292,10 +1058,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index 729dce34f14..c5cdc31a79c 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -59,7 +59,8 @@ class DDSFindTopicTest : public testing::Test bool serialize( const void* const, - fastdds::rtps::SerializedPayload_t*) override + fastdds::rtps::SerializedPayload_t*, + fastdds::dds::DataRepresentationId_t) override { return true; } @@ -72,7 +73,8 @@ class DDSFindTopicTest : public testing::Test } std::function getSerializedSizeProvider( - const void* const) override + const void* const, + fastdds::dds::DataRepresentationId_t) override { return {}; } diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index b5e52335dc2..cb5559fd55b 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -52,13 +52,6 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Data1mbPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index 9ec70bd190c..c4843c4f5a0 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -52,13 +52,6 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Data64kbPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index b51c27393ab..b79f6098cf9 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -85,13 +85,6 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixedSizedPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -101,12 +94,6 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -133,10 +120,6 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index 75830b9c78b..a22a6f25267 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~HelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index f351d1853db..8a46c5b1526 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -52,13 +52,6 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedData1mbPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index 31c5b9bfd6b..01321b923f9 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedHelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index 372d78eec85..a0ba72312ec 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -52,13 +52,6 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StringTestPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index b78d087acce..162fbdd89d1 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -53,13 +53,6 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~TestRegression3361PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index d190c95d4de..0e1fa937115 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -52,13 +52,6 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~UnboundedHelloWorldPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index 72f426d79aa..b5c8a45e887 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -62,13 +62,6 @@ namespace eprosima eProsima_user_DllExport ~EntityId_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -78,12 +71,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -110,10 +97,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -153,13 +136,6 @@ namespace eprosima eProsima_user_DllExport ~ProtocolVersion_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -169,12 +145,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -201,10 +171,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -244,13 +210,6 @@ namespace eprosima eProsima_user_DllExport ~VendorId_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -260,12 +219,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -292,10 +245,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -335,13 +284,6 @@ namespace eprosima eProsima_user_DllExport ~GuidPrefix_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -351,12 +293,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -383,10 +319,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -426,13 +358,6 @@ namespace eprosima eProsima_user_DllExport ~GUID_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -442,12 +367,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -474,10 +393,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -517,13 +432,6 @@ namespace eprosima eProsima_user_DllExport ~SequenceNumber_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -533,12 +441,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -565,10 +467,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -608,13 +506,6 @@ namespace eprosima eProsima_user_DllExport ~Count_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -624,12 +515,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -656,10 +541,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -699,13 +580,6 @@ namespace eprosima eProsima_user_DllExport ~Time_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -715,12 +589,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -747,10 +615,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -791,13 +655,6 @@ namespace eprosima eProsima_user_DllExport ~SequenceNumberSetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -807,12 +664,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -839,10 +690,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -882,13 +729,6 @@ namespace eprosima eProsima_user_DllExport ~Locator_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -898,12 +738,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -930,10 +764,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -973,13 +803,6 @@ namespace eprosima eProsima_user_DllExport ~Duration_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -989,12 +812,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1021,10 +838,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1066,13 +879,6 @@ namespace eprosima eProsima_user_DllExport ~StatusInfo_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1082,12 +888,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1114,10 +914,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1157,13 +953,6 @@ namespace eprosima eProsima_user_DllExport ~KeyHash_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1173,12 +962,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1205,10 +988,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1248,13 +1027,6 @@ namespace eprosima eProsima_user_DllExport ~EntityName_tPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1264,12 +1036,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1296,10 +1062,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1340,13 +1102,6 @@ namespace eprosima eProsima_user_DllExport ~HeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1356,12 +1111,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1388,10 +1137,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1431,13 +1176,6 @@ namespace eprosima eProsima_user_DllExport ~SubmessageHeaderPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1447,12 +1185,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1479,10 +1211,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1525,13 +1253,6 @@ namespace eprosima eProsima_user_DllExport ~AckNackSubmessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1541,12 +1262,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1573,10 +1288,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1616,13 +1327,6 @@ namespace eprosima eProsima_user_DllExport ~HeartBeatSubmessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1632,12 +1336,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1664,10 +1362,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1707,13 +1401,6 @@ namespace eprosima eProsima_user_DllExport ~InfoDestinationSubmessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1723,12 +1410,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1755,10 +1436,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1798,13 +1475,6 @@ namespace eprosima eProsima_user_DllExport ~InfoSourceSubmessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1814,12 +1484,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1846,10 +1510,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1889,13 +1549,6 @@ namespace eprosima eProsima_user_DllExport ~InfoTimestampSubmessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1905,12 +1558,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1937,10 +1584,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1981,13 +1624,6 @@ namespace eprosima eProsima_user_DllExport ~RTPSMessagePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1997,12 +1633,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2029,10 +1659,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index 966a6a459c8..951c853eedf 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -59,13 +59,6 @@ namespace eprosima eProsima_user_DllExport ~ConnectionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -75,12 +68,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -107,10 +94,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -150,13 +133,6 @@ namespace eprosima eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -166,12 +142,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -198,10 +168,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -241,13 +207,6 @@ namespace eprosima eProsima_user_DllExport ~BaseStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -257,12 +216,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -289,10 +242,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -333,13 +282,6 @@ namespace eprosima eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -349,12 +291,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -381,10 +317,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -424,13 +356,6 @@ namespace eprosima eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -440,12 +365,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -472,10 +391,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -515,13 +430,6 @@ namespace eprosima eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -531,12 +439,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -563,10 +465,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -623,13 +521,6 @@ namespace eprosima eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -639,12 +530,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -671,10 +556,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index fb99b8c567d..77c37085ca3 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -60,13 +60,6 @@ namespace eprosima eProsima_user_DllExport ~EntityId_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -76,12 +69,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -108,10 +95,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -151,13 +134,6 @@ namespace eprosima eProsima_user_DllExport ~GuidPrefix_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -167,12 +143,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -199,10 +169,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -242,13 +208,6 @@ namespace eprosima eProsima_user_DllExport ~GUID_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -258,12 +217,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -290,10 +243,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -333,13 +282,6 @@ namespace eprosima eProsima_user_DllExport ~SequenceNumber_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -349,12 +291,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -381,10 +317,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -424,13 +356,6 @@ namespace eprosima eProsima_user_DllExport ~SampleIdentity_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -440,12 +365,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -472,10 +391,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -515,13 +430,6 @@ namespace eprosima eProsima_user_DllExport ~Locator_sPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -531,12 +439,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -563,10 +465,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -607,13 +505,6 @@ namespace eprosima eProsima_user_DllExport ~DiscoveryTimePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -623,12 +514,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -655,10 +540,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -698,13 +579,6 @@ namespace eprosima eProsima_user_DllExport ~EntityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -714,12 +588,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -746,10 +614,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -789,13 +653,6 @@ namespace eprosima eProsima_user_DllExport ~SampleIdentityCountPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -805,12 +662,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -837,10 +688,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -880,13 +727,6 @@ namespace eprosima eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -896,12 +736,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -928,10 +762,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -971,13 +801,6 @@ namespace eprosima eProsima_user_DllExport ~WriterReaderDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -987,12 +810,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1019,10 +836,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1062,13 +875,6 @@ namespace eprosima eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1078,12 +884,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1110,10 +910,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1153,13 +949,6 @@ namespace eprosima eProsima_user_DllExport ~EntityDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1169,12 +958,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1201,10 +984,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1244,13 +1023,6 @@ namespace eprosima eProsima_user_DllExport ~PhysicalDataPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1260,12 +1032,6 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1292,10 +1058,6 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index 6ac00ba62c3..3a3a410dcec 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -78,13 +78,6 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasInt16PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -94,12 +87,6 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -126,10 +113,6 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -169,13 +152,6 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasUint16PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -185,12 +161,6 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -217,10 +187,6 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -260,13 +226,6 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasInt32PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -276,12 +235,6 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -308,10 +261,6 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -351,13 +300,6 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasUInt32PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -367,12 +309,6 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -399,10 +335,6 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -442,13 +374,6 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasInt64PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -458,12 +383,6 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -490,10 +409,6 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -533,13 +448,6 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasUInt64PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -549,12 +457,6 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -581,10 +483,6 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -624,13 +522,6 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasFloat32PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -640,12 +531,6 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -672,10 +557,6 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -715,13 +596,6 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasFloat64PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -731,12 +605,6 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -763,10 +631,6 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -806,13 +670,6 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasFloat128PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -822,12 +679,6 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -854,10 +705,6 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -897,13 +744,6 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasBoolPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -913,12 +753,6 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -945,10 +779,6 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -988,13 +818,6 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1004,12 +827,6 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1036,10 +853,6 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1079,13 +892,6 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasChar8PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1095,12 +901,6 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1127,10 +927,6 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1170,13 +966,6 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasChar16PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1186,12 +975,6 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1218,10 +1001,6 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1261,13 +1040,6 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasString8PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1277,12 +1049,6 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1309,10 +1075,6 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1352,13 +1114,6 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasString16PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1368,12 +1123,6 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1400,10 +1149,6 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1443,13 +1188,6 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1459,12 +1197,6 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1491,10 +1223,6 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1534,13 +1262,6 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasBitmaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1550,12 +1271,6 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1582,10 +1297,6 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1625,13 +1336,6 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1641,12 +1345,6 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1673,10 +1371,6 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1716,13 +1410,6 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1732,12 +1419,6 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1764,10 +1445,6 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1807,13 +1484,6 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasMultiArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1823,12 +1493,6 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1855,10 +1519,6 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1898,13 +1558,6 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1914,12 +1567,6 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1946,10 +1593,6 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1989,13 +1632,6 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2005,12 +1641,6 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2037,10 +1667,6 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2080,13 +1706,6 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2096,12 +1715,6 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2128,10 +1741,6 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2171,13 +1780,6 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2187,12 +1789,6 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2219,10 +1815,6 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2262,13 +1854,6 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2278,12 +1863,6 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2310,10 +1889,6 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index ad990d06a56..1fdc2857aee 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -53,13 +53,6 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AnnotatedStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~EmptyAnnotatedStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -236,13 +202,6 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~BasicAnnotationsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -252,12 +211,6 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -284,10 +237,6 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index 83db540ff19..158de9e14c2 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -53,13 +53,6 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~AppendableUShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~AppendableLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableULongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~AppendableLongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~AppendableULongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableFloatStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~AppendableDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~AppendableLongDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~AppendableBooleanStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableOctetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~AppendableCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableWCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableUnionStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~AppendableEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~AppendableEmptyInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~AppendableInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~AppendableInheritanceEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~AppendableExtensibilityInheritancePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index 5bc03cf83fa..f9d15c2408b 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -53,13 +53,6 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~ArrayBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~ArrayBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayShortArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1966,26 +1609,13 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~ArrayMultiDimensionUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2601,13 +2125,6 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ArrayMultiDimensionLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2617,12 +2134,6 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2649,10 +2160,6 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2692,13 +2199,6 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2708,12 +2208,6 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2740,10 +2234,6 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2783,13 +2273,6 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~ArrayMultiDimensionLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2799,12 +2282,6 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2831,10 +2308,6 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2874,13 +2347,6 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~ArrayMultiDimensionULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2890,12 +2356,6 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2922,10 +2382,6 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2965,13 +2421,6 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2981,12 +2430,6 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3013,10 +2456,6 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3056,13 +2495,6 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~ArrayMultiDimensionDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3072,12 +2504,6 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3104,10 +2530,6 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3147,13 +2569,6 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~ArrayMultiDimensionLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3163,12 +2578,6 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3195,10 +2604,6 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3238,13 +2643,6 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ArrayMultiDimensionBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3254,12 +2652,6 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3286,10 +2678,6 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3329,13 +2717,6 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3345,12 +2726,6 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3377,10 +2752,6 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3420,13 +2791,6 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ArrayMultiDimensionCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3436,12 +2800,6 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3468,10 +2826,6 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3511,13 +2865,6 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3527,12 +2874,6 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3559,10 +2900,6 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3602,13 +2939,6 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~ArrayMultiDimensionStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3618,12 +2948,6 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3650,10 +2974,6 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3693,13 +3013,6 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ArrayMultiDimensionWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3709,12 +3022,6 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3741,10 +3048,6 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3784,13 +3087,6 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3800,12 +3096,6 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3832,10 +3122,6 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3875,13 +3161,6 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArrayMultiDimensionBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3891,12 +3170,6 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3923,10 +3196,6 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3966,13 +3235,6 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ArrayMultiDimensionEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3982,12 +3244,6 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4014,10 +3270,6 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4057,13 +3309,6 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ArrayMultiDimensionBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4073,12 +3318,6 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4105,10 +3344,6 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4148,13 +3383,6 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4164,12 +3392,6 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4196,10 +3418,6 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4239,13 +3457,6 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~ArrayMultiDimensionSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4255,12 +3466,6 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4287,10 +3492,6 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4330,13 +3531,6 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~ArrayMultiDimensionMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4346,12 +3540,6 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4378,10 +3566,6 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4421,13 +3605,6 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~ArrayMultiDimensionUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4437,12 +3614,6 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4469,10 +3640,6 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4512,13 +3679,6 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~ArrayMultiDimensionStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4528,12 +3688,6 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4560,10 +3714,6 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4603,13 +3753,6 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~ArrayMultiDimensionBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4619,12 +3762,6 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4651,10 +3788,6 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4696,13 +3829,6 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4712,12 +3838,6 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4744,10 +3864,6 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4787,13 +3903,6 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eProsima_user_DllExport ~ArraySingleDimensionLiteralsUnsignedShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4803,12 +3912,6 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4835,10 +3938,6 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4878,13 +3977,6 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArraySingleDimensionLiteralsLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4894,12 +3986,6 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4926,10 +4012,6 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4969,13 +4051,6 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eProsima_user_DllExport ~ArraySingleDimensionLiteralsUnsignedLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4985,12 +4060,6 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5017,10 +4086,6 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5060,13 +4125,6 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~ArraySingleDimensionLiteralsLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5076,12 +4134,6 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5108,10 +4160,6 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5151,13 +4199,6 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eProsima_user_DllExport ~ArraySingleDimensionLiteralsUnsignedLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5167,12 +4208,6 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5199,10 +4234,6 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5242,13 +4273,6 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5258,12 +4282,6 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5290,10 +4308,6 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5333,13 +4347,6 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArraySingleDimensionLiteralsDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5349,12 +4356,6 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5381,10 +4382,6 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5424,13 +4421,6 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport ~ArraySingleDimensionLiteralsLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5440,12 +4430,6 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5472,10 +4456,6 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5515,13 +4495,6 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~ArraySingleDimensionLiteralsBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5531,12 +4504,6 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5563,10 +4530,6 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5606,27 +4569,14 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -5654,10 +4604,6 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5697,13 +4643,6 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArraySingleDimensionLiteralsCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5713,12 +4652,6 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5745,10 +4678,6 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5788,13 +4717,6 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5804,12 +4726,6 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5836,10 +4752,6 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5879,13 +4791,6 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArraySingleDimensionLiteralsStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5895,12 +4800,6 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5927,10 +4826,6 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5970,13 +4865,6 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~ArraySingleDimensionLiteralsWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5986,12 +4874,6 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6018,10 +4900,6 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6061,13 +4939,6 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eProsima_user_DllExport ~ArraySingleDimensionLiteralsBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6077,12 +4948,6 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6109,10 +4974,6 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6152,13 +5013,6 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eProsima_user_DllExport ~ArraySingleDimensionLiteralsBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6168,12 +5022,6 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6200,10 +5048,6 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6243,13 +5087,6 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArraySingleDimensionLiteralsEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6259,12 +5096,6 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6291,10 +5122,6 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6334,13 +5161,6 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~ArraySingleDimensionLiteralsBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6350,12 +5170,6 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6382,10 +5196,6 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6425,13 +5235,6 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6441,12 +5244,6 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6473,10 +5270,6 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6516,13 +5309,6 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eProsima_user_DllExport ~ArraySingleDimensionLiteralsShortArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6532,12 +5318,6 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6564,10 +5344,6 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6607,13 +5383,6 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eProsima_user_DllExport ~ArraySingleDimensionLiteralsSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6623,12 +5392,6 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6655,10 +5418,6 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6698,13 +5457,6 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~ArraySingleDimensionLiteralsMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6714,12 +5466,6 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6746,10 +5492,6 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6789,13 +5531,6 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArraySingleDimensionLiteralsUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6805,12 +5540,6 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6837,10 +5566,6 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6880,13 +5605,6 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eProsima_user_DllExport ~ArraySingleDimensionLiteralsStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6896,12 +5614,6 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6928,10 +5640,6 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6971,13 +5679,6 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArraySingleDimensionLiteralsBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6987,12 +5688,6 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7019,10 +5714,6 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7062,13 +5753,6 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7078,12 +5762,6 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7110,10 +5788,6 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7153,13 +5827,6 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArrayMultiDimensionLiteralsUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7169,12 +5836,6 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7201,10 +5862,6 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7244,13 +5901,6 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7260,12 +5910,6 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7292,10 +5936,6 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7335,13 +5975,6 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7351,12 +5984,6 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7383,10 +6010,6 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7426,13 +6049,6 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7442,12 +6058,6 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7474,10 +6084,6 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7517,13 +6123,6 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7531,13 +6130,7 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -7565,10 +6158,6 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7608,13 +6197,6 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7624,12 +6206,6 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7656,10 +6232,6 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7699,13 +6271,6 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArrayMultiDimensionLiteralsDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7715,12 +6280,6 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7747,10 +6306,6 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7790,13 +6345,6 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7806,12 +6354,6 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7838,10 +6380,6 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7881,13 +6419,6 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArrayMultiDimensionLiteralsBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7897,12 +6428,6 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7929,10 +6454,6 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7972,13 +6493,6 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7988,12 +6502,6 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8020,10 +6528,6 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8063,13 +6567,6 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8079,12 +6576,6 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8111,10 +6602,6 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8154,13 +6641,6 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8170,12 +6650,6 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8202,10 +6676,6 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8245,13 +6715,6 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArrayMultiDimensionLiteralsStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8261,12 +6724,6 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8293,10 +6750,6 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8336,13 +6789,6 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArrayMultiDimensionLiteralsWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8352,12 +6798,6 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8384,10 +6824,6 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8427,13 +6863,6 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eProsima_user_DllExport ~ArrayMultiDimensionLiteralsBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8443,12 +6872,6 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8475,10 +6898,6 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8518,13 +6937,6 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eProsima_user_DllExport ~ArrayMultiDimensionLiteralsBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8534,12 +6946,6 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8566,10 +6972,6 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8609,13 +7011,6 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8625,12 +7020,6 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8657,10 +7046,6 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8700,13 +7085,6 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ArrayMultiDimensionLiteralsBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8716,12 +7094,6 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8748,10 +7120,6 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8791,13 +7159,6 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8807,12 +7168,6 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8839,10 +7194,6 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8882,13 +7233,6 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8898,12 +7242,6 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8930,10 +7268,6 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8973,13 +7307,6 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8989,12 +7316,6 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9021,10 +7342,6 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9064,13 +7381,6 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~ArrayMultiDimensionLiteralsUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9080,12 +7390,6 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9112,10 +7416,6 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9155,13 +7455,6 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eProsima_user_DllExport ~ArrayMultiDimensionLiteralsStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9171,12 +7464,6 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9203,10 +7490,6 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9246,13 +7529,6 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~ArrayMultiDimensionLiteralsBitSetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9262,12 +7538,6 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9294,10 +7564,6 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9337,13 +7603,6 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~BoundedSmallArraysPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9353,12 +7612,6 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9385,10 +7638,6 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9428,13 +7677,6 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BoundedBigArraysPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9444,12 +7686,6 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9476,10 +7712,6 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index bb349267a1a..200084b2545 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -53,13 +53,6 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BitsetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index e756388d7d5..18a50f66b75 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -59,13 +59,6 @@ namespace const_module1 eProsima_user_DllExport ~ModuleConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -75,12 +68,6 @@ namespace const_module1 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -107,10 +94,6 @@ namespace const_module1 #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -153,13 +136,6 @@ namespace const_module2 eProsima_user_DllExport ~Module2ConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -169,12 +145,6 @@ namespace const_module2 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -201,10 +171,6 @@ namespace const_module2 #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -245,13 +211,6 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~ConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -261,12 +220,6 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -293,10 +246,6 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index d066074f218..352b9b9e731 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -57,13 +57,6 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~ForwardDeclarationsRecursiveStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -73,12 +66,6 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -105,10 +92,6 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -149,13 +132,6 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -165,12 +141,6 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -197,10 +167,6 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -246,13 +212,6 @@ namespace declarations_module eProsima_user_DllExport ~ForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -262,12 +221,6 @@ namespace declarations_module eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -294,10 +247,6 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -338,13 +287,6 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eProsima_user_DllExport ~ModuledForwardDeclarationsRecursiveStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -354,12 +296,6 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -386,10 +322,6 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -431,13 +363,6 @@ namespace declarations_module eProsima_user_DllExport ~ModuledForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -447,12 +372,6 @@ namespace declarations_module eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -479,10 +398,6 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -525,13 +440,6 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ModuledCommonNameStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -541,12 +449,6 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -573,10 +475,6 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index f2ac0587742..e8230378cd2 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -56,13 +56,6 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~EnumStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -72,12 +65,6 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -104,10 +91,6 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -147,13 +130,6 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BitMaskStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -163,12 +139,6 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -195,10 +165,6 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -238,13 +204,6 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~BoundedBitMaskStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -254,12 +213,6 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -286,10 +239,6 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index ddab0c35114..ed4a2d3f441 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -53,13 +53,6 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~short_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ushort_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~long_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ulong_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~longlong_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~ulonglong_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~float_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~double_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~longdouble_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~boolean_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~octet_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~char_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~wchar_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~sequence_short_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~string_unbounded_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~string_bounded_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~map_short_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~array_short_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~struct_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~InnerStructExternalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~ext_struct_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1964,13 +1607,6 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~ext_and_inner_struct_externalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1980,12 +1616,6 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~struct_external_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2147,13 +1756,6 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~recursive_union_containerPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2163,12 +1765,6 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2195,10 +1791,6 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2239,13 +1831,6 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~recursive_test_1PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2255,12 +1840,6 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2287,10 +1866,6 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2332,13 +1907,6 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~recursive_structurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2348,12 +1916,6 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2380,10 +1942,6 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2423,13 +1981,6 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~recursive_test_2PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2439,12 +1990,6 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2471,10 +2016,6 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index f0e601fca31..90e13b29eec 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -86,13 +86,6 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -102,12 +95,6 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -134,10 +121,6 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -232,13 +215,6 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalUShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -248,12 +224,6 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -280,10 +250,6 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -378,13 +344,6 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -394,12 +353,6 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -426,10 +379,6 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -524,13 +473,6 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalULongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -540,12 +482,6 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -572,10 +508,6 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -670,13 +602,6 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~FinalLongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -686,12 +611,6 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -718,10 +637,6 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -816,13 +731,6 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~FinalULongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -832,12 +740,6 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -864,10 +766,6 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -962,13 +860,6 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalFloatStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -978,12 +869,6 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1010,10 +895,6 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1108,13 +989,6 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1124,12 +998,6 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1156,10 +1024,6 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1254,13 +1118,6 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~FinalLongDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1270,12 +1127,6 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1302,10 +1153,6 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1400,13 +1247,6 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~FinalBooleanStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1416,12 +1256,6 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1448,10 +1282,6 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1546,13 +1376,6 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalOctetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1562,12 +1385,6 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1594,10 +1411,6 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1692,13 +1505,6 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1708,12 +1514,6 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1740,10 +1540,6 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1838,13 +1634,6 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalWCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1854,12 +1643,6 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1886,10 +1669,6 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1951,13 +1730,6 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalUnionStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1967,12 +1739,6 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1999,10 +1765,6 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2042,13 +1804,6 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2058,12 +1813,6 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2090,10 +1839,6 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2151,13 +1896,6 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~FinalEmptyInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2167,12 +1905,6 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2199,10 +1931,6 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2242,13 +1970,6 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~FinalInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2258,12 +1979,6 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2290,10 +2005,6 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2333,13 +2044,6 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~InheritanceEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2349,12 +2053,6 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2381,10 +2079,6 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2479,13 +2173,6 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~FinalExtensibilityInheritancePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2495,12 +2182,6 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2527,10 +2208,6 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index a3cb7ac6e95..035a8cb07a8 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -53,13 +53,6 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~InnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~InnerEmptyStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.cxx b/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.cxx index 35dbe23e632..f634f343488 100644 --- a/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.cxx +++ b/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.cxx @@ -647,7 +647,7 @@ void register_InnerBitsetHelper_type_identifier( uint16_t position_a = 0; BitsetMemberFlag flags_a = 0; uint8_t bitcount_a = 3; - TypeKind holder_type_a = TK_BYTE; + TypeKind holder_type_a = TK_UINT8; CommonBitfield common_a = TypeObjectUtils::build_common_bitfield(position_a, flags_a, bitcount_a, holder_type_a); eprosima::fastcdr::optional member_ann_builtin_a; ann_custom_InnerBitsetHelper.reset(); diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index d72a0642be2..fc4d2d7b819 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -53,13 +53,6 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~InnerStructureHelperChildPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~InnerStructureHelperChildChildPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~InnerStructureHelperEmptyChildPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~InnerStructureHelperEmptyChildChildPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~InnerEmptyStructureHelperChildPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~StructAliasInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~StructuresInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -693,13 +574,6 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~BitsetsChildInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -709,12 +583,6 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -741,10 +609,6 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/inheritanceTypeObjectSupport.cxx b/test/dds-types-test/inheritanceTypeObjectSupport.cxx index 9dbab17bc21..f427506e27e 100644 --- a/test/dds-types-test/inheritanceTypeObjectSupport.cxx +++ b/test/dds-types-test/inheritanceTypeObjectSupport.cxx @@ -796,7 +796,7 @@ void register_InnerBitsetHelperChild_type_identifier( uint16_t position_a = 0; BitsetMemberFlag flags_a = 0; uint8_t bitcount_a = 3; - TypeKind holder_type_a = TK_BYTE; + TypeKind holder_type_a = TK_UINT8; CommonBitfield common_a = TypeObjectUtils::build_common_bitfield(position_a, flags_a, bitcount_a, holder_type_a); eprosima::fastcdr::optional member_ann_builtin_a; ann_custom_InnerBitsetHelperChild.reset(); @@ -886,7 +886,7 @@ void register_InnerBitsetHelperChild_type_identifier( uint16_t position_a = 0; BitsetMemberFlag flags_a = 0; uint8_t bitcount_a = 3; - TypeKind holder_type_a = TK_BYTE; + TypeKind holder_type_a = TK_UINT8; CommonBitfield common_a = TypeObjectUtils::build_common_bitfield(position_a, flags_a, bitcount_a, holder_type_a); eprosima::fastcdr::optional member_ann_builtin_a; ann_custom_InnerBitsetHelperChildChild.reset(); @@ -989,7 +989,7 @@ void register_InnerBitsetHelperChild_type_identifier( uint16_t position_a = 0; BitsetMemberFlag flags_a = 0; uint8_t bitcount_a = 3; - TypeKind holder_type_a = TK_BYTE; + TypeKind holder_type_a = TK_UINT8; CommonBitfield common_a = TypeObjectUtils::build_common_bitfield(position_a, flags_a, bitcount_a, holder_type_a); eprosima::fastcdr::optional member_ann_builtin_a; ann_custom_BitsetAliasInheritanceBitset.reset(); diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index 2e292ad59f7..3a1c7d3e6ac 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -52,13 +52,6 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -143,13 +126,6 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedUShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,12 +135,6 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -191,10 +161,6 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -234,13 +200,6 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,12 +209,6 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -282,10 +235,6 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -325,13 +274,6 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedULongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -341,12 +283,6 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -373,10 +309,6 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -416,13 +348,6 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~KeyedLongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -432,12 +357,6 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -464,10 +383,6 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -507,13 +422,6 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~KeyedULongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -523,12 +431,6 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -555,10 +457,6 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -598,13 +496,6 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedFloatStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -614,12 +505,6 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -646,10 +531,6 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -689,13 +570,6 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -705,12 +579,6 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -737,10 +605,6 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -780,13 +644,6 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~KeyedLongDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -796,12 +653,6 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -828,10 +679,6 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -871,13 +718,6 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~KeyedBooleanStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -887,12 +727,6 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -919,10 +753,6 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -962,13 +792,6 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedOctetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -978,12 +801,6 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1010,10 +827,6 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1053,13 +866,6 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1069,12 +875,6 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1101,10 +901,6 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1144,13 +940,6 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedWCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1160,12 +949,6 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1192,10 +975,6 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1235,13 +1014,6 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyedEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1251,12 +1023,6 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1283,10 +1049,6 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1326,13 +1088,6 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~KeyedEmptyInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1342,12 +1097,6 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1374,10 +1123,6 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1417,13 +1162,6 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~KeyedInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1433,12 +1171,6 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1465,10 +1197,6 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1508,13 +1236,6 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~InheritanceKeyedEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1524,12 +1245,6 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1556,10 +1271,6 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index 34c1d60871e..6d58575762a 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -53,13 +53,6 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapShortLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapShortWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapShortInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapShortInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapShortInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapShortInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapShortInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapShortInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1966,26 +1609,13 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapShortInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapShortInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapShortInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapShortInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2601,13 +2125,6 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2617,12 +2134,6 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2649,10 +2160,6 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2692,13 +2199,6 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2708,12 +2208,6 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2740,10 +2234,6 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2783,13 +2273,6 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2799,12 +2282,6 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2831,10 +2308,6 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2874,13 +2347,6 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapUShortULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2890,12 +2356,6 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2922,10 +2382,6 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2965,13 +2421,6 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2981,12 +2430,6 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3013,10 +2456,6 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3056,13 +2495,6 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3072,12 +2504,6 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3104,10 +2530,6 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3147,13 +2569,6 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapUShortLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3163,12 +2578,6 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3195,10 +2604,6 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3238,13 +2643,6 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3254,12 +2652,6 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3286,10 +2678,6 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3329,13 +2717,6 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3345,12 +2726,6 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3377,10 +2752,6 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3420,13 +2791,6 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3436,12 +2800,6 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3468,10 +2826,6 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3511,13 +2865,6 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3527,12 +2874,6 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3559,10 +2900,6 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3602,13 +2939,6 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3618,12 +2948,6 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3650,10 +2974,6 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3693,13 +3013,6 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapUShortWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3709,12 +3022,6 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3741,10 +3048,6 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3784,13 +3087,6 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapUShortInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3800,12 +3096,6 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3832,10 +3122,6 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3877,26 +3163,13 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3923,10 +3196,6 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3966,13 +3235,6 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapUShortInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3982,12 +3244,6 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4014,10 +3270,6 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4057,13 +3309,6 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapUShortInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4073,12 +3318,6 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4105,10 +3344,6 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4148,13 +3383,6 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapUShortInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4164,12 +3392,6 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4196,10 +3418,6 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4239,13 +3457,6 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~MapUShortInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4255,12 +3466,6 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4287,10 +3492,6 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4330,13 +3531,6 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~MapUShortInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4346,12 +3540,6 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4378,10 +3566,6 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4421,13 +3605,6 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapUShortInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4437,12 +3614,6 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4469,10 +3640,6 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4512,13 +3679,6 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapUShortInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4528,12 +3688,6 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4560,10 +3714,6 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4603,13 +3753,6 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapUShortInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4619,12 +3762,6 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4651,10 +3788,6 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4694,13 +3827,6 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapUShortInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4710,12 +3836,6 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4742,10 +3862,6 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4785,13 +3901,6 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4801,12 +3910,6 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4833,10 +3936,6 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4876,13 +3975,6 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4892,12 +3984,6 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4924,10 +4010,6 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4967,13 +4049,6 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4983,12 +4058,6 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5015,10 +4084,6 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5058,13 +4123,6 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5074,12 +4132,6 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5106,10 +4158,6 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5149,13 +4197,6 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapLongKeyLongLongValuePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5165,12 +4206,6 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5197,10 +4232,6 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5240,13 +4271,6 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5256,12 +4280,6 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5288,10 +4306,6 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5331,13 +4345,6 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5347,12 +4354,6 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5379,10 +4380,6 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5422,13 +4419,6 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5438,12 +4428,6 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5470,10 +4454,6 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5513,13 +4493,6 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapLongKeyLongDoubleValuePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5529,12 +4502,6 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5561,10 +4528,6 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5604,13 +4567,6 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5620,12 +4576,6 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5652,10 +4602,6 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5695,13 +4641,6 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5711,12 +4650,6 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5743,10 +4676,6 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5788,26 +4717,13 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5834,10 +4750,6 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5877,13 +4789,6 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5893,12 +4798,6 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5925,10 +4824,6 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5968,13 +4863,6 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5984,12 +4872,6 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6016,10 +4898,6 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6059,13 +4937,6 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6075,12 +4946,6 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6107,10 +4972,6 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6150,13 +5011,6 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~MapLongInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6166,12 +5020,6 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6198,10 +5046,6 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6241,13 +5085,6 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapLongInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6257,12 +5094,6 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6289,10 +5120,6 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6332,13 +5159,6 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~MapLongInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6348,12 +5168,6 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6380,10 +5194,6 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6423,13 +5233,6 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapLongInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6439,12 +5242,6 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6471,10 +5268,6 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6514,13 +5307,6 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapLongInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6530,12 +5316,6 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6562,10 +5342,6 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6605,13 +5381,6 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapLongInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6621,12 +5390,6 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6653,10 +5416,6 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6696,13 +5455,6 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~MapLongInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6712,12 +5464,6 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6744,10 +5490,6 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6787,13 +5529,6 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapLongInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6803,12 +5538,6 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6835,10 +5564,6 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6878,13 +5603,6 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapLongInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6894,12 +5612,6 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6926,10 +5638,6 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6969,13 +5677,6 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapLongInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6985,12 +5686,6 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7017,10 +5712,6 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7060,13 +5751,6 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapLongInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7076,12 +5760,6 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7108,10 +5786,6 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7151,13 +5825,6 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7167,12 +5834,6 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7199,10 +5860,6 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7242,13 +5899,6 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7258,12 +5908,6 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7290,10 +5934,6 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7333,13 +5973,6 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7349,12 +5982,6 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7381,10 +6008,6 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7424,13 +6047,6 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7440,12 +6056,6 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7472,10 +6082,6 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7515,13 +6121,6 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapKeyULongValueLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7531,12 +6130,6 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7563,10 +6156,6 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7606,13 +6195,6 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7622,12 +6204,6 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7654,10 +6230,6 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7699,26 +6271,13 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7745,10 +6304,6 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7788,13 +6343,6 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7804,12 +6352,6 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7836,10 +6378,6 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7879,13 +6417,6 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapKeyULongValueLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7895,12 +6426,6 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7927,10 +6452,6 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7970,13 +6491,6 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7986,12 +6500,6 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8018,10 +6526,6 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8061,13 +6565,6 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8077,12 +6574,6 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8109,10 +6600,6 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8152,13 +6639,6 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8168,12 +6648,6 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8200,10 +6674,6 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8243,13 +6713,6 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8259,12 +6722,6 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8291,10 +6748,6 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8334,13 +6787,6 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8350,12 +6796,6 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8382,10 +6822,6 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8425,13 +6861,6 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8441,12 +6870,6 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8473,10 +6896,6 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8516,13 +6935,6 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapULongInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8532,12 +6944,6 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8564,10 +6970,6 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8607,13 +7009,6 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapULongInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8623,12 +7018,6 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8655,10 +7044,6 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8698,13 +7083,6 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapULongInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8714,12 +7092,6 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8746,10 +7118,6 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8789,13 +7157,6 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapULongInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8805,12 +7166,6 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8837,10 +7192,6 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8880,13 +7231,6 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapULongInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8896,12 +7240,6 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -8928,10 +7266,6 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -8971,13 +7305,6 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapULongInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -8987,12 +7314,6 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9019,10 +7340,6 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9062,13 +7379,6 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~MapULongInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9078,12 +7388,6 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9110,10 +7414,6 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9153,13 +7453,6 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapULongInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9169,12 +7462,6 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9201,10 +7488,6 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9244,13 +7527,6 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapULongInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9260,12 +7536,6 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9292,10 +7562,6 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9335,13 +7601,6 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapULongInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9351,12 +7610,6 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9383,10 +7636,6 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9426,13 +7675,6 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapULongInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9442,12 +7684,6 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9474,10 +7710,6 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9517,13 +7749,6 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9533,12 +7758,6 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9565,10 +7784,6 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9610,26 +7825,13 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9656,10 +7858,6 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9699,13 +7897,6 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MapLongLongKeyLongValuePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9715,12 +7906,6 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9747,10 +7932,6 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9790,13 +7971,6 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9806,12 +7980,6 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9838,10 +8006,6 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9881,13 +8045,6 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapLongLongLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9897,12 +8054,6 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -9929,10 +8080,6 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -9972,13 +8119,6 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~MapLongLongULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -9988,12 +8128,6 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10020,10 +8154,6 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10063,13 +8193,6 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10079,12 +8202,6 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10111,10 +8228,6 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10154,13 +8267,6 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapLongLongKeyDoubleValuePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10170,12 +8276,6 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10202,10 +8302,6 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10245,13 +8341,6 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~MapLongLongLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10261,12 +8350,6 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10293,10 +8376,6 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10336,13 +8415,6 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapLongLongBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10352,12 +8424,6 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10384,10 +8450,6 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10427,13 +8489,6 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10443,12 +8498,6 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10475,10 +8524,6 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10518,13 +8563,6 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10534,12 +8572,6 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10566,10 +8598,6 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10609,13 +8637,6 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10625,12 +8646,6 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10657,10 +8672,6 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10700,13 +8711,6 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapLongLongStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10716,12 +8720,6 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10748,10 +8746,6 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10791,13 +8785,6 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapLongLongWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10807,12 +8794,6 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10839,10 +8820,6 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10882,13 +8859,6 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport ~MapLongLongInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10898,12 +8868,6 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -10930,10 +8894,6 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -10973,13 +8933,6 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport ~MapLongLongInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -10989,12 +8942,6 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11021,10 +8968,6 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11064,13 +9007,6 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapLongLongInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11080,12 +9016,6 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11112,10 +9042,6 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11155,13 +9081,6 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapLongLongInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11171,12 +9090,6 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11203,10 +9116,6 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11246,13 +9155,6 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapLongLongInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11262,12 +9164,6 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11294,10 +9190,6 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11337,13 +9229,6 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~MapLongLongInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11353,12 +9238,6 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11385,10 +9264,6 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11428,13 +9303,6 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eProsima_user_DllExport ~MapLongLongInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11444,12 +9312,6 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11476,10 +9338,6 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11521,26 +9379,13 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11567,10 +9412,6 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11610,13 +9451,6 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapLongLongInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11626,12 +9460,6 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11658,10 +9486,6 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11701,13 +9525,6 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~MapLongLongInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11717,12 +9534,6 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11749,10 +9560,6 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11792,13 +9599,6 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapLongLongInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11808,12 +9608,6 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11840,10 +9634,6 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11883,13 +9673,6 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11899,12 +9682,6 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -11931,10 +9708,6 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -11974,13 +9747,6 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapULongLongUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -11990,12 +9756,6 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12022,10 +9782,6 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12065,13 +9821,6 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12081,12 +9830,6 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12113,10 +9856,6 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12156,13 +9895,6 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12172,12 +9904,6 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12204,10 +9930,6 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12247,13 +9969,6 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~MapULongLongLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12263,12 +9978,6 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12295,10 +10004,6 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12338,13 +10043,6 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~MapULongLongULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12354,12 +10052,6 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12386,10 +10078,6 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12429,13 +10117,6 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12445,12 +10126,6 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12477,10 +10152,6 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12520,13 +10191,6 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapKeyULongLongValueDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12536,12 +10200,6 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12568,10 +10226,6 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12611,13 +10265,6 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~MapULongLongLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12627,12 +10274,6 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12659,10 +10300,6 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12702,13 +10339,6 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapULongLongBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12718,12 +10348,6 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12750,10 +10374,6 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12793,13 +10413,6 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12809,12 +10422,6 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12841,10 +10448,6 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12884,13 +10487,6 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12900,12 +10496,6 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -12932,10 +10522,6 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -12975,13 +10561,6 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapULongLongWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -12991,12 +10570,6 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13023,10 +10596,6 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13066,13 +10635,6 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapULongLongStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13082,12 +10644,6 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13114,10 +10670,6 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13157,13 +10709,6 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapULongLongWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13173,12 +10718,6 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13205,10 +10744,6 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13248,13 +10783,6 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport ~MapULongLongInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13264,12 +10792,6 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13296,10 +10818,6 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13339,13 +10857,6 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eProsima_user_DllExport ~MapULongLongInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13355,12 +10866,6 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13387,10 +10892,6 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13432,26 +10933,13 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13478,10 +10966,6 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13521,13 +11005,6 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~MapULongLongInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13537,12 +11014,6 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13569,10 +11040,6 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13612,13 +11079,6 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapULongLongInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13628,12 +11088,6 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13660,10 +11114,6 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13703,13 +11153,6 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~MapULongLongInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13719,12 +11162,6 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13751,10 +11188,6 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13794,13 +11227,6 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~MapULongLongInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13810,12 +11236,6 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13842,10 +11262,6 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13885,13 +11301,6 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~MapULongLongInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13901,12 +11310,6 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -13933,10 +11336,6 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -13976,13 +11375,6 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapULongLongInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -13992,12 +11384,6 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14024,10 +11410,6 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14067,13 +11449,6 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport ~MapULongLongInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14083,12 +11458,6 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14115,10 +11484,6 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14158,13 +11523,6 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapULongLongInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14174,12 +11532,6 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14206,10 +11558,6 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14249,13 +11597,6 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14265,12 +11606,6 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14297,10 +11632,6 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14340,13 +11671,6 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14356,12 +11680,6 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14388,10 +11706,6 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14431,13 +11745,6 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14447,12 +11754,6 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14479,10 +11780,6 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14522,13 +11819,6 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14538,12 +11828,6 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14570,10 +11854,6 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14613,13 +11893,6 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14629,12 +11902,6 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14661,10 +11928,6 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14704,13 +11967,6 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapStringULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14720,12 +11976,6 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14752,10 +12002,6 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14795,13 +12041,6 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14811,12 +12050,6 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14843,10 +12076,6 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14886,13 +12115,6 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14902,12 +12124,6 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -14934,10 +12150,6 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -14977,13 +12189,6 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapStringLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -14993,12 +12198,6 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15025,10 +12224,6 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15068,13 +12263,6 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15084,12 +12272,6 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15116,10 +12298,6 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15159,13 +12337,6 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15175,12 +12346,6 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15207,10 +12372,6 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15250,13 +12411,6 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15266,12 +12420,6 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15298,10 +12446,6 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15343,26 +12487,13 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15389,10 +12520,6 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15432,13 +12559,6 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15448,12 +12568,6 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15480,10 +12594,6 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15523,13 +12633,6 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStringWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15539,12 +12642,6 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15571,10 +12668,6 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15614,13 +12707,6 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapStringInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15630,12 +12716,6 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15662,10 +12742,6 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15705,13 +12781,6 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapStringInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15721,12 +12790,6 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15753,10 +12816,6 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15796,13 +12855,6 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MapStringInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15812,12 +12864,6 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15844,10 +12890,6 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15887,13 +12929,6 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapStringInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15903,12 +12938,6 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -15935,10 +12964,6 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -15978,13 +13003,6 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapStringInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -15994,12 +13012,6 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16026,10 +13038,6 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16069,13 +13077,6 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~MapStringInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16085,12 +13086,6 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16117,10 +13112,6 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16160,13 +13151,6 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~MapStringInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16176,12 +13160,6 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16208,10 +13186,6 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16251,13 +13225,6 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapStringInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16267,12 +13234,6 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16299,10 +13260,6 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16342,13 +13299,6 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapStringInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16358,12 +13308,6 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16390,10 +13334,6 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16433,13 +13373,6 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapStringInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16449,12 +13382,6 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16481,10 +13408,6 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16524,13 +13447,6 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapStringInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16540,12 +13456,6 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16572,10 +13482,6 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16615,13 +13521,6 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16631,12 +13530,6 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16663,10 +13556,6 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16706,13 +13595,6 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16722,12 +13604,6 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16754,10 +13630,6 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16797,13 +13669,6 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16813,12 +13678,6 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16845,10 +13704,6 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16888,13 +13743,6 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16904,12 +13752,6 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -16936,10 +13778,6 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -16979,13 +13817,6 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MapWStringLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -16995,12 +13826,6 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17027,10 +13852,6 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17070,13 +13891,6 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MapWStringULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17086,12 +13900,6 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17118,10 +13926,6 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17161,13 +13965,6 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17177,12 +13974,6 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17209,10 +14000,6 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17254,26 +14041,13 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17300,10 +14074,6 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17343,13 +14113,6 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~MapWStringLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17359,12 +14122,6 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17391,10 +14148,6 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17434,13 +14187,6 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17450,12 +14196,6 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17482,10 +14222,6 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17525,13 +14261,6 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17541,12 +14270,6 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17573,10 +14296,6 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17616,13 +14335,6 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17632,12 +14344,6 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17664,10 +14370,6 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17707,13 +14409,6 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17723,12 +14418,6 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17755,10 +14444,6 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17798,13 +14483,6 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17814,12 +14492,6 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17846,10 +14518,6 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17889,13 +14557,6 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapWStringWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17905,12 +14566,6 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -17937,10 +14592,6 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -17980,13 +14631,6 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapWStringInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -17996,12 +14640,6 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18028,10 +14666,6 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18071,13 +14705,6 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport ~MapWStringInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18087,12 +14714,6 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18119,10 +14740,6 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18162,13 +14779,6 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~MapWStringInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18178,12 +14788,6 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18210,10 +14814,6 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18253,13 +14853,6 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~MapWStringInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18269,12 +14862,6 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18301,10 +14888,6 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18344,13 +14927,6 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapWStringInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18360,12 +14936,6 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18392,10 +14962,6 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18435,13 +15001,6 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~MapWStringInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18451,12 +15010,6 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18483,10 +15036,6 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18526,13 +15075,6 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eProsima_user_DllExport ~MapWStringInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18542,12 +15084,6 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18574,10 +15110,6 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18617,13 +15149,6 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MapWStringInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18633,12 +15158,6 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18665,10 +15184,6 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18708,13 +15223,6 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~MapWStringInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18724,12 +15232,6 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18756,10 +15258,6 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18799,13 +15297,6 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport ~MapWStringInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18815,12 +15306,6 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18847,10 +15332,6 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18890,13 +15371,6 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~MapWStringInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18906,12 +15380,6 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -18938,10 +15406,6 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -18981,13 +15445,6 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -18997,12 +15454,6 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19029,10 +15480,6 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19072,13 +15519,6 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19088,12 +15528,6 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19120,10 +15554,6 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19163,13 +15593,6 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19179,12 +15602,6 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19211,10 +15628,6 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19254,13 +15667,6 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19270,12 +15676,6 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19302,10 +15702,6 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19345,13 +15741,6 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19361,12 +15750,6 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19393,10 +15776,6 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19436,13 +15815,6 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19452,12 +15824,6 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19484,10 +15850,6 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19527,13 +15889,6 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19543,12 +15898,6 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19575,10 +15924,6 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19618,13 +15963,6 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19634,12 +15972,6 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19666,10 +15998,6 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19709,13 +16037,6 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19725,12 +16046,6 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19757,10 +16072,6 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19800,13 +16111,6 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19816,12 +16120,6 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19848,10 +16146,6 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19891,13 +16185,6 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -19907,12 +16194,6 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -19939,10 +16220,6 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -19982,27 +16259,14 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -20030,10 +16294,6 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20073,13 +16333,6 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20089,12 +16342,6 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20121,10 +16368,6 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20164,13 +16407,6 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20180,12 +16416,6 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20212,10 +16442,6 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20255,13 +16481,6 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20271,12 +16490,6 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20303,10 +16516,6 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20346,13 +16555,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20362,12 +16564,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20394,10 +16590,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20437,13 +16629,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20453,12 +16638,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20485,10 +16664,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20528,13 +16703,6 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20544,12 +16712,6 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20576,10 +16738,6 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20619,13 +16777,6 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20635,12 +16786,6 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20667,10 +16812,6 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20710,13 +16851,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20726,12 +16860,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20758,10 +16886,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20801,13 +16925,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20817,12 +16934,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20849,10 +16960,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20892,13 +16999,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20908,12 +17008,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -20940,10 +17034,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -20983,13 +17073,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -20999,12 +17082,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21031,10 +17108,6 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21074,13 +17147,6 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21090,12 +17156,6 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21122,10 +17182,6 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21165,13 +17221,6 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21181,12 +17230,6 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21213,10 +17256,6 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21256,13 +17295,6 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eProsima_user_DllExport ~MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21272,12 +17304,6 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21304,10 +17330,6 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21347,13 +17369,6 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21363,12 +17378,6 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21395,10 +17404,6 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21438,13 +17443,6 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21454,12 +17452,6 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21486,10 +17478,6 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21529,13 +17517,6 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21545,12 +17526,6 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21577,10 +17552,6 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21620,13 +17591,6 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21636,12 +17600,6 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21668,10 +17626,6 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21711,13 +17665,6 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21727,12 +17674,6 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21759,10 +17700,6 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21802,13 +17739,6 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21818,12 +17748,6 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -21850,10 +17774,6 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21893,13 +17813,6 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -21907,13 +17820,7 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -21941,10 +17848,6 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -21984,13 +17887,6 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22000,12 +17896,6 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22032,10 +17922,6 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22075,13 +17961,6 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22091,12 +17970,6 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22123,10 +17996,6 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22166,13 +18035,6 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22182,12 +18044,6 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22214,10 +18070,6 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22257,13 +18109,6 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22273,12 +18118,6 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22305,10 +18144,6 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22348,13 +18183,6 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22364,12 +18192,6 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22396,10 +18218,6 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22439,13 +18257,6 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22455,12 +18266,6 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22487,10 +18292,6 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22530,13 +18331,6 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22546,12 +18340,6 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22578,10 +18366,6 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22621,13 +18405,6 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22637,12 +18414,6 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22669,10 +18440,6 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22712,13 +18479,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22728,12 +18488,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22760,10 +18514,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22803,13 +18553,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22819,12 +18562,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22851,10 +18588,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22894,13 +18627,6 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -22910,12 +18636,6 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -22942,10 +18662,6 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -22985,13 +18701,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23001,12 +18710,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23033,10 +18736,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23076,13 +18775,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23092,12 +18784,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23124,10 +18810,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23167,13 +18849,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23183,12 +18858,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23215,10 +18884,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23258,13 +18923,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23274,12 +18932,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23306,10 +18958,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23349,13 +18997,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23365,12 +19006,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23397,10 +19032,6 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23440,13 +19071,6 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23456,12 +19080,6 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23488,10 +19106,6 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23531,13 +19145,6 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23547,12 +19154,6 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23579,10 +19180,6 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23622,13 +19219,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eProsima_user_DllExport ~MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23638,12 +19228,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23670,10 +19254,6 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23713,13 +19293,6 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BoundedSmallMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23729,12 +19302,6 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23761,10 +19328,6 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -23804,13 +19367,6 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BoundedLargeMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -23820,12 +19376,6 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -23852,10 +19402,6 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index 676c0df01cc..6dc1da78bb2 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -52,13 +52,6 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixIdPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -143,13 +126,6 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixHexIdPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,12 +135,6 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -191,10 +161,6 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -234,13 +200,6 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixHashidDefaultPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,12 +209,6 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -282,10 +235,6 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -325,13 +274,6 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixHashidPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -341,12 +283,6 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -373,10 +309,6 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -416,13 +348,6 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FixMixPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -432,12 +357,6 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -464,10 +383,6 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -507,13 +422,6 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AutoidDefaultPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -523,12 +431,6 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -555,10 +457,6 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -598,13 +496,6 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AutoidSequentialPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -614,12 +505,6 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -646,10 +531,6 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -689,13 +570,6 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AutoidHashPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -705,12 +579,6 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -737,10 +605,6 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -780,13 +644,6 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~DerivedAutoidDefaultPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -796,12 +653,6 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -828,10 +679,6 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -871,13 +718,6 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~DerivedEmptyAutoidSequentialPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -887,12 +727,6 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -919,10 +753,6 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -962,13 +792,6 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~DerivedAutoidSequentialPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -978,12 +801,6 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1010,10 +827,6 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1053,13 +866,6 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~DerivedAutoidHashPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1069,12 +875,6 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1101,10 +901,6 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index 5bb1f1652ca..f166c710663 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -53,13 +53,6 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MutableUShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MutableLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableULongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~MutableLongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~MutableULongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableFloatStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~MutableDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~MutableLongDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~MutableBooleanStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableOctetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MutableCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableWCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableUnionStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~MutableEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MutableEmptyInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~MutableInheritanceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~MutableInheritanceEmptyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~MutableExtensibilityInheritancePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index 6adef3dac91..83ee020bfe7 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -53,13 +53,6 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~short_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ushort_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~long_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ulong_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~longlong_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~ulonglong_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~float_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~double_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~longdouble_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~boolean_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~octet_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~char_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~wchar_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~short_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~short_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~short_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ushort_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ushort_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~ushort_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~long_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~long_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1966,26 +1609,13 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~ulong_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~ulong_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~ulong_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~longlong_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~longlong_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~longlong_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2601,13 +2125,6 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ulonglong_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2617,12 +2134,6 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2649,10 +2160,6 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2692,13 +2199,6 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ulonglong_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2708,12 +2208,6 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2740,10 +2234,6 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2783,13 +2273,6 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~ulonglong_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2799,12 +2282,6 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2831,10 +2308,6 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2874,13 +2347,6 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~float_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2890,12 +2356,6 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2922,10 +2382,6 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2965,13 +2421,6 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~float_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2981,12 +2430,6 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3013,10 +2456,6 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3056,13 +2495,6 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~float_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3072,12 +2504,6 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3104,10 +2530,6 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3147,13 +2569,6 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~double_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3163,12 +2578,6 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3195,10 +2604,6 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3238,13 +2643,6 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~double_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3254,12 +2652,6 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3286,10 +2678,6 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3329,13 +2717,6 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~double_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3345,12 +2726,6 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3377,10 +2752,6 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3420,13 +2791,6 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~longdouble_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3436,12 +2800,6 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3468,10 +2826,6 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3511,13 +2865,6 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~longdouble_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3527,12 +2874,6 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3559,10 +2900,6 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3602,13 +2939,6 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~longdouble_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3618,12 +2948,6 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3650,10 +2974,6 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3693,13 +3013,6 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~boolean_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3709,12 +3022,6 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3741,10 +3048,6 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3784,13 +3087,6 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~boolean_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3800,12 +3096,6 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3832,10 +3122,6 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3875,13 +3161,6 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~boolean_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3891,12 +3170,6 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3923,10 +3196,6 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3966,13 +3235,6 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~octet_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3982,12 +3244,6 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4014,10 +3270,6 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4057,13 +3309,6 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~octet_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4073,12 +3318,6 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4105,10 +3344,6 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4148,13 +3383,6 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~octet_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4164,12 +3392,6 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4196,10 +3418,6 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4239,13 +3457,6 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~char_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4255,12 +3466,6 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4287,10 +3492,6 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4330,13 +3531,6 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~char_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4346,12 +3540,6 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4378,10 +3566,6 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4421,13 +3605,6 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~char_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4437,12 +3614,6 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4469,10 +3640,6 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4512,13 +3679,6 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~wchar_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4528,12 +3688,6 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4560,10 +3714,6 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4603,13 +3753,6 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~wchar_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4619,12 +3762,6 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4651,10 +3788,6 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4694,13 +3827,6 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~wchar_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4710,12 +3836,6 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4742,10 +3862,6 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4785,13 +3901,6 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~sequence_short_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4801,12 +3910,6 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4833,10 +3936,6 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4876,13 +3975,6 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~sequence_short_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4892,12 +3984,6 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -4924,10 +4010,6 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -4967,13 +4049,6 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~sequence_short_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -4983,12 +4058,6 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5015,10 +4084,6 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5058,13 +4123,6 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~sequence_short_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5074,12 +4132,6 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5106,10 +4158,6 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5149,13 +4197,6 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~string_unbounded_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5165,12 +4206,6 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5197,10 +4232,6 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5240,13 +4271,6 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~string_unbounded_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5256,12 +4280,6 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5288,10 +4306,6 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5331,13 +4345,6 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~string_unbounded_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5347,12 +4354,6 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5379,10 +4380,6 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5422,13 +4419,6 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport ~string_unbounded_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5436,13 +4426,7 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, - void* data) override; - - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } + void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, @@ -5470,10 +4454,6 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5513,13 +4493,6 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~string_bounded_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5529,12 +4502,6 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5561,10 +4528,6 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5604,13 +4567,6 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~string_bounded_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5620,12 +4576,6 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5652,10 +4602,6 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5695,13 +4641,6 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~string_bounded_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5711,12 +4650,6 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5743,10 +4676,6 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5786,13 +4715,6 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport ~string_bounded_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5802,12 +4724,6 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5834,10 +4750,6 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5877,13 +4789,6 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~map_short_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5893,12 +4798,6 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -5925,10 +4824,6 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -5968,13 +4863,6 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~map_short_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -5984,12 +4872,6 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6016,10 +4898,6 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6059,13 +4937,6 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~map_short_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6075,12 +4946,6 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6107,10 +4972,6 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6150,13 +5011,6 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~map_short_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6166,12 +5020,6 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6198,10 +5046,6 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6241,13 +5085,6 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~array_short_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6257,12 +5094,6 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6289,10 +5120,6 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6332,13 +5159,6 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~array_short_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6348,12 +5168,6 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6380,10 +5194,6 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6423,13 +5233,6 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~array_short_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6439,12 +5242,6 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6471,10 +5268,6 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6514,13 +5307,6 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport ~array_short_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6530,12 +5316,6 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6562,10 +5342,6 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6605,13 +5381,6 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~struct_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6621,12 +5390,6 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6653,10 +5416,6 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6696,13 +5455,6 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~struct_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6712,12 +5464,6 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6744,10 +5490,6 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6787,13 +5529,6 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~struct_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6803,12 +5538,6 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6835,10 +5564,6 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6878,13 +5603,6 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~struct_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6894,12 +5612,6 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -6926,10 +5638,6 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -6969,13 +5677,6 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~InnerStructOptionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -6985,12 +5686,6 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7017,10 +5712,6 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7060,13 +5751,6 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~opt_struct_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7076,12 +5760,6 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7108,10 +5786,6 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7151,13 +5825,6 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~opt_struct_align_1_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7167,12 +5834,6 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7199,10 +5860,6 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7242,13 +5899,6 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~opt_struct_align_2_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7258,12 +5908,6 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7290,10 +5934,6 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -7333,13 +5973,6 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~opt_struct_align_4_optionalPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -7349,12 +5982,6 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -7381,10 +6008,6 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index af517f9d0f5..447bffadb95 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -52,13 +52,6 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -143,13 +126,6 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UShortStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,12 +135,6 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -191,10 +161,6 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -234,13 +200,6 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~LongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,12 +209,6 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -282,10 +235,6 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -325,13 +274,6 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ULongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -341,12 +283,6 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -373,10 +309,6 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -416,13 +348,6 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~LongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -432,12 +357,6 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -464,10 +383,6 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -507,13 +422,6 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ULongLongStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -523,12 +431,6 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -555,10 +457,6 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -598,13 +496,6 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FloatStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -614,12 +505,6 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -646,10 +531,6 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -689,13 +570,6 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~DoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -705,12 +579,6 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -737,10 +605,6 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -780,13 +644,6 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~LongDoubleStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -796,12 +653,6 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -828,10 +679,6 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -871,13 +718,6 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BooleanStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -887,12 +727,6 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -919,10 +753,6 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -962,13 +792,6 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~OctetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -978,12 +801,6 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1010,10 +827,6 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1053,13 +866,6 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~CharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1069,12 +875,6 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1101,10 +901,6 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1144,13 +940,6 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~WCharStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1160,12 +949,6 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1192,10 +975,6 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1235,13 +1014,6 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Int8StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1251,12 +1023,6 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1283,10 +1049,6 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1326,13 +1088,6 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Uint8StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1342,12 +1097,6 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1374,10 +1123,6 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1417,13 +1162,6 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Int16StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1433,12 +1171,6 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1465,10 +1197,6 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1508,13 +1236,6 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Uint16StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1524,12 +1245,6 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1556,10 +1271,6 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1599,13 +1310,6 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Int32StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1615,12 +1319,6 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1647,10 +1345,6 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1690,13 +1384,6 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Uint32StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1706,12 +1393,6 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1738,10 +1419,6 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1781,13 +1458,6 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Int64StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1797,12 +1467,6 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1829,10 +1493,6 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1872,13 +1532,6 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~Uint64StructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1888,12 +1541,6 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1920,10 +1567,6 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index a3a64030f8a..262819942cc 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -53,13 +53,6 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~RelativePathIncludeStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index 1026cb42b25..e833d1bcad4 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -53,13 +53,6 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~SequenceLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~SequenceStringBoundedPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~SequenceWStringBoundedPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~SequenceShortArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1964,13 +1607,6 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1980,12 +1616,6 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~BoundedSmallSequencesPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~BoundedBigSequencesPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index d05e089cec4..9eaecbd6088 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -52,13 +52,6 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -143,13 +126,6 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~WStringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,12 +135,6 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -191,10 +161,6 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -234,13 +200,6 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SmallStringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,12 +209,6 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -282,10 +235,6 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -325,13 +274,6 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~SmallWStringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -341,12 +283,6 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -373,10 +309,6 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -416,13 +348,6 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~LargeStringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -432,12 +357,6 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -464,10 +383,6 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -507,13 +422,6 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~LargeWStringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -523,12 +431,6 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -555,10 +457,6 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index aeac8ffe3f1..882ad142551 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -53,13 +53,6 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~StructUnsignedShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~StructUnsignedLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~StructUnsignedLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructChar8PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructChar16PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~StructBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~StructBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructBitMaskPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructShortArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1964,13 +1607,6 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1980,12 +1616,6 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructUnionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructStructurePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructBitsetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructEmptyPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructuresPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2603,13 +2127,6 @@ namespace testing_1 eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2619,12 +2136,6 @@ namespace testing_1 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2651,10 +2162,6 @@ namespace testing_1 #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2697,13 +2204,6 @@ namespace testing_2 eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2713,12 +2213,6 @@ namespace testing_2 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2745,10 +2239,6 @@ namespace testing_2 #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2789,13 +2279,6 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~barPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2805,12 +2288,6 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2837,10 +2314,6 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2880,13 +2353,6 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~root1PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2896,12 +2362,6 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2928,10 +2388,6 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2971,13 +2427,6 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~root2PubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2987,12 +2436,6 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3019,10 +2462,6 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3062,13 +2501,6 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~rootPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3078,12 +2510,6 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3110,10 +2536,6 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index 0449462c75d..7ab74304023 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -53,13 +53,6 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -69,12 +62,6 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -101,10 +88,6 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -144,13 +127,6 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -160,12 +136,6 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -192,10 +162,6 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -235,13 +201,6 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -251,12 +210,6 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -283,10 +236,6 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -326,13 +275,6 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -342,12 +284,6 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -374,10 +310,6 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -417,13 +349,6 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -433,12 +358,6 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -465,10 +384,6 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -508,13 +423,6 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -524,12 +432,6 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -556,10 +458,6 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -599,13 +497,6 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionFloatPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -615,12 +506,6 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -647,10 +532,6 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -690,13 +571,6 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -706,12 +580,6 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -738,10 +606,6 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -781,13 +645,6 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionLongDoublePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -797,12 +654,6 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -829,10 +680,6 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -872,13 +719,6 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -888,12 +728,6 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -920,10 +754,6 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -963,13 +793,6 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -979,12 +802,6 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1011,10 +828,6 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1054,13 +867,6 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1070,12 +876,6 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1102,10 +902,6 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1145,13 +941,6 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1161,12 +950,6 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1193,10 +976,6 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1236,13 +1015,6 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1252,12 +1024,6 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1284,10 +1050,6 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1327,13 +1089,6 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1343,12 +1098,6 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1375,10 +1124,6 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1418,13 +1163,6 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~UnionBoundedStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1434,12 +1172,6 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1466,10 +1198,6 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1509,13 +1237,6 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~UnionBoundedWStringPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1525,12 +1246,6 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1557,10 +1272,6 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1600,13 +1311,6 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport ~UnionInnerEnumHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1616,12 +1320,6 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1648,10 +1346,6 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1691,13 +1385,6 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionInnerBitMaskHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1707,12 +1394,6 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1739,10 +1420,6 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1782,13 +1459,6 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~UnionInnerAliasHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1798,12 +1468,6 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1830,10 +1494,6 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1873,13 +1533,6 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionArrayPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1889,12 +1542,6 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -1921,10 +1568,6 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -1964,13 +1607,6 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionSequencePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -1980,12 +1616,6 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2012,10 +1642,6 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2055,13 +1681,6 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionMapPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2071,12 +1690,6 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2103,10 +1716,6 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2146,13 +1755,6 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~UnionInnerUnionHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2162,12 +1764,6 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2194,10 +1790,6 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2237,13 +1829,6 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~UnionInnerStructureHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2253,12 +1838,6 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2285,10 +1864,6 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2328,13 +1903,6 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~UnionInnerBitsetHelperPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2344,12 +1912,6 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2376,10 +1938,6 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2419,13 +1977,6 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionDiscriminatorShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2435,12 +1986,6 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2467,10 +2012,6 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2510,13 +2051,6 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport ~UnionDiscriminatorUShortPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2526,12 +2060,6 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2558,10 +2086,6 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2601,13 +2125,6 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~UnionDiscriminatorLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2617,12 +2134,6 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2649,10 +2160,6 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2692,13 +2199,6 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionDiscriminatorULongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2708,12 +2208,6 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2740,10 +2234,6 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2783,13 +2273,6 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport ~UnionDiscriminatorLongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2799,12 +2282,6 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2831,10 +2308,6 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2874,13 +2347,6 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~UnionDiscriminatorULongLongPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2890,12 +2356,6 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -2922,10 +2382,6 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -2965,13 +2421,6 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport ~UnionDiscriminatorBooleanPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -2981,12 +2430,6 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3013,10 +2456,6 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3056,13 +2495,6 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionDiscriminatorOctetPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3072,12 +2504,6 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3104,10 +2530,6 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3147,13 +2569,6 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~UnionDiscriminatorCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3163,12 +2578,6 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3195,10 +2604,6 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3238,13 +2643,6 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionDiscriminatorWCharPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3254,12 +2652,6 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3286,10 +2678,6 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3329,13 +2717,6 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~UnionDiscriminatorEnumPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3345,12 +2726,6 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3377,10 +2752,6 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3420,13 +2791,6 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport ~UnionDiscriminatorEnumLabelPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3436,12 +2800,6 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3468,10 +2826,6 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3511,13 +2865,6 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport ~UnionDiscriminatorAliasPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3527,12 +2874,6 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3559,10 +2900,6 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3602,13 +2939,6 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~UnionSeveralFieldsPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3618,12 +2948,6 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3650,10 +2974,6 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -3693,13 +3013,6 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport ~UnionSeveralFieldsWithDefaultPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -3709,12 +3022,6 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -3741,10 +3048,6 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index 7c5e78aaa5b..a88679078a8 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -104,13 +104,6 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -118,11 +111,6 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } std::function getSerializedSizeProvider( const void* const data, @@ -149,11 +137,11 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType bool is_bounded() const override { - // All plain types are bounded - return is_plain(); + return true; } - bool is_plain() const override + bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t) const override { // It is plain because the type has a fixed size return true; @@ -208,13 +196,6 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -222,11 +203,6 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } std::function getSerializedSizeProvider( const void* const data, diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index 171f57b299a..7cec8fd08af 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -136,13 +136,6 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -152,12 +145,6 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -182,11 +169,11 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType bool is_bounded() const override { - // All plain types are bounded - return is_plain(); + return true; } - bool is_plain() const override + bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t /*data_representation*/) const override { // It is plain because the type has a fixed sized return true; @@ -266,13 +253,6 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -282,12 +262,6 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; diff --git a/test/profiling/MemoryTestTypes.cpp b/test/profiling/MemoryTestTypes.cpp index ccef5eb9931..94289f0e94f 100644 --- a/test/profiling/MemoryTestTypes.cpp +++ b/test/profiling/MemoryTestTypes.cpp @@ -24,7 +24,8 @@ using namespace eprosima::fastdds::rtps; bool MemoryDataType::serialize( const void* const data, - SerializedPayload_t* payload) + SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t) { const MemoryType* lt = static_cast(data); @@ -37,14 +38,6 @@ bool MemoryDataType::serialize( return true; } -bool MemoryDataType::serialize( - const void* const data, - SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t) -{ - return serialize(data, payload); -} - bool MemoryDataType::deserialize( SerializedPayload_t* payload, void* data) @@ -57,7 +50,8 @@ bool MemoryDataType::deserialize( } std::function MemoryDataType::getSerializedSizeProvider( - const void* const data) + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t) { return [data]() -> uint32_t { @@ -70,13 +64,6 @@ std::function MemoryDataType::getSerializedSizeProvider( }; } -std::function MemoryDataType::getSerializedSizeProvider( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t) -{ - return getSerializedSizeProvider(data); -} - void* MemoryDataType::createData() { @@ -92,7 +79,8 @@ void MemoryDataType::deleteData( bool TestCommandDataType::serialize( const void* const data, - SerializedPayload_t* payload) + SerializedPayload_t* payload, + eprosima::fastdds::dds::DataRepresentationId_t) { const TestCommandType* t = static_cast(data); *(TESTCOMMAND*)payload->data = t->m_command; @@ -100,14 +88,6 @@ bool TestCommandDataType::serialize( return true; } -bool TestCommandDataType::serialize( - const void* const data, - SerializedPayload_t* payload, - eprosima::fastdds::dds::DataRepresentationId_t) -{ - return serialize(data, payload); -} - bool TestCommandDataType::deserialize( SerializedPayload_t* payload, void* data) @@ -118,7 +98,8 @@ bool TestCommandDataType::deserialize( } std::function TestCommandDataType::getSerializedSizeProvider( - const void* const) + const void* const, + eprosima::fastdds::dds::DataRepresentationId_t) { return []() -> uint32_t { @@ -130,13 +111,6 @@ std::function TestCommandDataType::getSerializedSizeProvider( }; } -std::function TestCommandDataType::getSerializedSizeProvider( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t) -{ - return getSerializedSizeProvider(data); -} - void* TestCommandDataType::createData() { diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index 3be55229e94..cad92d0795f 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -89,9 +89,6 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -99,8 +96,6 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override; std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -158,9 +153,6 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType { } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -168,8 +160,6 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( - const void* const data) override; std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index ffc3e93d584..ccec06cc82e 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -52,13 +52,6 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AllocTestTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index 9aacba03bec..7d32c15e502 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -96,13 +96,6 @@ class TopicDataTypeMock : public TopicDataType setName("footype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -118,12 +111,6 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -170,13 +157,6 @@ class LoanableTopicDataTypeMock : public TopicDataType setName("loanablefootype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -192,12 +172,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -223,11 +197,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - inline bool is_plain() const override - { - return true; - } - inline bool is_plain( DataRepresentationId_t) const override { diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index ccc278a988b..b79be805db0 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -93,13 +93,6 @@ class TopicDataTypeMock : public TopicDataType setName("footype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -115,12 +108,6 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -198,13 +185,6 @@ class InstanceTopicDataTypeMock : public TopicDataType setName("instancefootype"); } - bool serialize( - const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override - { - return true; - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -220,15 +200,6 @@ class InstanceTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const /*data*/) override - { - return []()->uint32_t - { - return 0; - }; - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -273,13 +244,6 @@ class BoundedTopicDataTypeMock : public TopicDataType setName("bounded_footype"); } - bool serialize( - const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override - { - return true; - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -295,12 +259,6 @@ class BoundedTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const /*data*/) override - { - return std::function(); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -1328,13 +1286,6 @@ class LoanableTypeSupport : public TopicDataType setName("LoanableType"); } - bool serialize( - const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override - { - return true; - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -1350,15 +1301,6 @@ class LoanableTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const /*data*/) override - { - return [this]() - { - return m_typeSize; - }; - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -1392,11 +1334,6 @@ class LoanableTypeSupport : public TopicDataType return true; } - bool is_plain() const override - { - return true; - } - bool is_plain( DataRepresentationId_t) const override { @@ -1505,11 +1442,6 @@ class LoanableTypeSupportTesting : public LoanableTypeSupport bool is_plain_result = true; bool construct_sample_result = true; - bool is_plain() const override - { - return is_plain_result; - } - bool is_plain( DataRepresentationId_t) const override { @@ -2181,13 +2113,6 @@ class DataRepresentationTestsTypeSupport : public LoanableTypeSupport return custom_is_plain_with_rep(data_representation_id); } - MOCK_CONST_METHOD0(custom_is_plain, bool()); - - bool is_plain() const override - { - return custom_is_plain(); - } - }; TEST(DataWriterTests, data_type_is_plain_data_representation) @@ -2212,7 +2137,6 @@ TEST(DataWriterTests, data_type_is_plain_data_representation) qos_xcdr.endpoint().history_memory_policy = PREALLOCATED_WITH_REALLOC_MEMORY_MODE; /* Expect the "is_plain" method called with default data representation (XCDR1) */ - EXPECT_CALL(*type, custom_is_plain()).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)).Times( testing::AtLeast(1)).WillRepeatedly(testing::Return(true)); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)).Times(0); @@ -2230,7 +2154,6 @@ TEST(DataWriterTests, data_type_is_plain_data_representation) qos_xcdr2.representation().m_value.push_back(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION); /* Expect the "is_plain" method called with XCDR2 data representation */ - EXPECT_CALL(*type, custom_is_plain()).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)).Times( testing::AtLeast(1)).WillRepeatedly(testing::Return(true)); diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index 6b809967287..fa5b46d4637 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -44,13 +44,6 @@ class TopicDataTypeMock : public TopicDataType setName("footype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -66,12 +59,6 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -113,13 +100,6 @@ class LoanableTopicDataTypeMock : public TopicDataType setName("loanablefootype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -135,12 +115,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -163,11 +137,6 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - inline bool is_plain() const override - { - return true; - } - inline bool is_plain( DataRepresentationId_t) const override { diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index 6673accbfa3..4fb6154c979 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -497,7 +497,8 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } @@ -510,7 +511,8 @@ class TopicDataTypeMock : public TopicDataType } std::function getSerializedSizeProvider( - const void* const /*data*/) override + const void* const /*data*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return []()->uint32_t { diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 73924c24ec1..4b6969c3e14 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -17,41 +17,32 @@ class TestType : public TopicDataType { public: - MOCK_METHOD(bool, serialize, ( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload), - (override)); - MOCK_METHOD(bool, serialize, ( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation), - (override)); + (override)); MOCK_METHOD(bool, deserialize, ( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data), - (override)); + (override)); MOCK_METHOD(std::function, getSerializedSizeProvider, ( const void* const data, DataRepresentationId_t data_representation), - (override)); - - MOCK_METHOD(std::function, getSerializedSizeProvider, ( - const void* const data), - (override)); + (override)); MOCK_METHOD(void*, createData, (), (override)); MOCK_METHOD(void, deleteData, ( void* data), - (override)); + (override)); MOCK_METHOD(bool, getKey, ( const void* const data, eprosima::fastdds::dds::InstanceHandle_t* ihandle, bool), - (override)); + (override)); }; /*! diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index e57edf26986..2eb90bebf2f 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -3768,13 +3768,6 @@ class DataRepresentationTestsTypeSupport : public TopicDataType setName("LoanableType"); } - bool serialize( - const void* const /*data*/, - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/) override - { - return true; - } - bool serialize( const void* const /*data*/, eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -3790,15 +3783,6 @@ class DataRepresentationTestsTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const /*data*/) override - { - return [this]() - { - return m_typeSize; - }; - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -3840,13 +3824,6 @@ class DataRepresentationTestsTypeSupport : public TopicDataType return custom_is_plain_with_rep(data_representation_id); } - MOCK_CONST_METHOD0(custom_is_plain, bool()); - - bool is_plain() const override - { - return custom_is_plain(); - } - }; TEST_F(DataReaderTests, data_type_is_plain_data_representation) @@ -3873,7 +3850,6 @@ TEST_F(DataReaderTests, data_type_is_plain_data_representation) qos_xcdr.representation().m_value.push_back(DataRepresentationId_t::XCDR_DATA_REPRESENTATION); /* Expect the "is_plain" method called with default data representation (XCDR1) */ - EXPECT_CALL(*type, custom_is_plain()).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)).Times( testing::AtLeast(1)).WillRepeatedly(testing::Return(true)); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)).Times(0); @@ -3891,7 +3867,6 @@ TEST_F(DataReaderTests, data_type_is_plain_data_representation) qos_xcdr2.representation().m_value.push_back(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION); /* Expect the "is_plain" method called with XCDR2 data representation */ - EXPECT_CALL(*type, custom_is_plain()).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)).Times( testing::AtLeast(1)).WillRepeatedly(testing::Return(true)); @@ -3906,7 +3881,6 @@ TEST_F(DataReaderTests, data_type_is_plain_data_representation) qos_no_xcdr.representation().m_value.clear(); /* Expect the "is_plain" method called with both data representation */ - EXPECT_CALL(*type, custom_is_plain()).Times(0); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR_DATA_REPRESENTATION)).Times( testing::AtLeast(1)).WillRepeatedly(testing::Return(true)); EXPECT_CALL(*type, custom_is_plain_with_rep(DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)).Times( diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index c9a7f09d679..8a6d51ec2bc 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -39,13 +39,6 @@ class FooBoundedTypeSupport : public TopicDataType m_isGetKeyDefined = false; } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, fastdds::rtps::SerializedPayload_t* payload, @@ -124,12 +117,6 @@ class FooBoundedTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const data, DataRepresentationId_t /*data_representation*/) override @@ -166,7 +153,8 @@ class FooBoundedTypeSupport : public TopicDataType return true; } - inline bool is_plain() const override + inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t) const override { return false; } diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index 757ef86b717..10bdda2b9d4 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -37,13 +37,6 @@ class FooTypeSupport : public TopicDataType m_isGetKeyDefined = true; } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const data, fastdds::rtps::SerializedPayload_t* payload, @@ -122,12 +115,6 @@ class FooTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override @@ -194,7 +181,8 @@ class FooTypeSupport : public TopicDataType return true; } - inline bool is_plain() const override + inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t) const override { return true; } diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp index 15c45cf5fa4..39d98cba7b7 100644 --- a/test/unittest/dds/subscriber/SubscriberTests.cpp +++ b/test/unittest/dds/subscriber/SubscriberTests.cpp @@ -153,13 +153,6 @@ class TopicDataTypeMock : public TopicDataType setName("footype"); } - bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - bool serialize( const void* const /*data*/, fastdds::rtps::SerializedPayload_t* /*payload*/, @@ -175,12 +168,6 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - std::function getSerializedSizeProvider( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override diff --git a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp index a9ea31a13cc..5be4aa2b56c 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp +++ b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp @@ -679,10 +679,10 @@ class DDSSQLFilterValueGlobalData { static ContentFilterTestTypePubSubType type_support; auto data_ptr = const_cast(&data); - auto data_size = type_support.getSerializedSizeProvider(data_ptr)(); + auto data_size = type_support.getSerializedSizeProvider(data_ptr, fastdds::dds::DEFAULT_DATA_REPRESENTATION)(); auto payload = new IContentFilter::SerializedPayload(data_size); values_.emplace_back(payload); - type_support.serialize(data_ptr, payload); + type_support.serialize(data_ptr, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); } void add_char_values( diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index ef6451890ec..1c4d185c594 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -52,13 +52,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -145,13 +128,6 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~ContentFilterTestTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -161,12 +137,6 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -193,10 +163,6 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index faa68b10c87..64c6bddeda1 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -74,7 +74,8 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } @@ -87,7 +88,8 @@ class TopicDataTypeMock : public TopicDataType } std::function getSerializedSizeProvider( - const void* const /*data*/) override + const void* const /*data*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return []()->uint32_t { diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index c538c5d95f5..9cde8a22627 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -52,13 +52,6 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~PrimitivesStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,12 +61,6 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -100,10 +87,6 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -152,13 +135,6 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AllStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -168,12 +144,6 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -200,10 +170,6 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -243,13 +209,6 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ComprehensiveTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -259,12 +218,6 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport std::function getSerializedSizeProvider( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; @@ -291,10 +244,6 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp index ca9b5aca931..25242104541 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp @@ -43,7 +43,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const /*data*/, - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/) override + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } @@ -56,7 +57,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType } std::function getSerializedSizeProvider( - const void* const /*data*/) override + const void* const /*data*/, + eprosima::fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return []()->uint32_t { diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index 5f468da82b0..f2752529427 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -88,7 +88,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } @@ -101,7 +102,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType } std::function getSerializedSizeProvider( - const void* const /*data*/) override + const void* const /*data*/, + fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return []()->uint32_t { From eee03dc6d893003d0383f7c5d4fd8b7f2436e692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 12 Jul 2024 12:54:34 +0200 Subject: [PATCH 02/14] Refs #21349. Apply suggestions: Update TopicDataType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../ConfigurationPubSubTypes.cxx | 102 +- .../ConfigurationPubSubTypes.hpp | 12 +- .../content_filter/HelloWorldPubSubTypes.cxx | 102 +- .../content_filter/HelloWorldPubSubTypes.hpp | 12 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- .../HelloWorldPublisher.cpp | 2 +- .../HelloWorldSubscriber.cpp | 2 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- examples/cpp/dds/Keys/samplePubSubTypes.cxx | 102 +- examples/cpp/dds/Keys/samplePubSubTypes.hpp | 12 +- .../LoanableHelloWorldPubSubTypes.cxx | 102 +- .../LoanableHelloWorldPubSubTypes.hpp | 12 +- .../LoanableHelloWorldPubSubTypes.cxx | 102 +- .../LoanableHelloWorldPubSubTypes.hpp | 12 +- .../DeliveryMechanismsPubSubTypes.cxx | 102 +- .../DeliveryMechanismsPubSubTypes.hpp | 12 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- .../flow_control/FlowControlPubSubTypes.cxx | 110 +- .../flow_control/FlowControlPubSubTypes.hpp | 12 +- .../cpp/hello_world/HelloWorldPubSubTypes.cxx | 102 +- .../cpp/hello_world/HelloWorldPubSubTypes.hpp | 12 +- .../types/CalculatorPubSubTypes.cxx | 219 +- .../types/CalculatorPubSubTypes.hpp | 24 +- .../cpp/security/HelloWorldPubSubTypes.cxx | 102 +- .../cpp/security/HelloWorldPubSubTypes.hpp | 12 +- .../HelloWorldPubSubTypes.cxx | 102 +- .../HelloWorldPubSubTypes.hpp | 12 +- include/fastdds/dds/topic/TopicDataType.hpp | 30 +- include/fastdds/dds/topic/TypeSupport.hpp | 20 +- .../dynamic_types/DynamicPubSubType.hpp | 8 +- .../dds_xtypes_typeobjectPubSubTypes.hpp | 1164 +- .../type_lookup_service/TypeLookupManager.cpp | 6 +- .../TypeLookupRequestListener.cpp | 12 +- .../detail/TypeLookupTypesPubSubTypes.cxx | 612 +- .../detail/TypeLookupTypesPubSubTypes.hpp | 72 +- .../detail/rpc_typesPubSubTypes.cxx | 612 +- .../detail/rpc_typesPubSubTypes.hpp | 72 +- src/cpp/fastdds/publisher/DataWriterImpl.cpp | 54 +- src/cpp/fastdds/publisher/DataWriterImpl.hpp | 4 +- src/cpp/fastdds/subscriber/DataReaderImpl.cpp | 14 +- .../DataReaderImpl/SampleLoanManager.hpp | 6 +- .../subscriber/history/DataReaderHistory.cpp | 14 +- src/cpp/fastdds/topic/TopicDataType.cpp | 7 - src/cpp/fastdds/topic/TopicImpl.cpp | 2 +- .../dynamic_types/DynamicPubSubType.cpp | 49 +- .../dds_xtypes_typeobjectPubSubTypes.cxx | 10296 +++--- .../fastdds/domain/DomainParticipantImpl.cpp | 8 +- .../rtps/monitor-service/MonitorService.cpp | 10 +- .../types/monitorservice_typesPubSubTypes.cxx | 714 +- .../types/monitorservice_typesPubSubTypes.hpp | 84 +- src/cpp/statistics/types/typesPubSubTypes.cxx | 1484 +- src/cpp/statistics/types/typesPubSubTypes.hpp | 168 +- .../api/dds-pim/PubSubParticipant.hpp | 4 +- test/blackbox/api/dds-pim/PubSubReader.hpp | 2 +- test/blackbox/api/dds-pim/PubSubWriter.hpp | 2 +- .../api/dds-pim/PubSubWriterReader.hpp | 4 +- .../api/dds-pim/ReqRepHelloWorldReplier.cpp | 4 +- .../api/dds-pim/ReqRepHelloWorldRequester.cpp | 4 +- .../dds-pim/TCPReqRepHelloWorldReplier.cpp | 4 +- .../dds-pim/TCPReqRepHelloWorldRequester.cpp | 4 +- .../common/DDSBlackboxTestsContentFilter.cpp | 2 +- .../common/DDSBlackboxTestsDiscovery.cpp | 2 +- .../common/DDSBlackboxTestsFindTopic.cpp | 18 +- .../common/DDSBlackboxTestsListeners.cpp | 10 +- test/blackbox/common/RTPSAsSocketReader.hpp | 2 +- test/blackbox/common/RTPSAsSocketWriter.hpp | 2 +- .../common/RTPSBlackboxTestsPools.cpp | 2 +- .../common/RTPSWithRegistrationReader.hpp | 4 +- .../common/RTPSWithRegistrationWriter.hpp | 4 +- test/blackbox/types/Data1mbPubSubTypes.cxx | 102 +- test/blackbox/types/Data1mbPubSubTypes.hpp | 12 +- test/blackbox/types/Data64kbPubSubTypes.cxx | 102 +- test/blackbox/types/Data64kbPubSubTypes.hpp | 12 +- test/blackbox/types/FixedSizedPubSubTypes.cxx | 102 +- test/blackbox/types/FixedSizedPubSubTypes.hpp | 12 +- test/blackbox/types/HelloWorldPubSubTypes.cxx | 102 +- test/blackbox/types/HelloWorldPubSubTypes.hpp | 12 +- .../types/KeyedData1mbPubSubTypes.cxx | 102 +- .../types/KeyedData1mbPubSubTypes.hpp | 12 +- .../types/KeyedHelloWorldPubSubTypes.cxx | 102 +- .../types/KeyedHelloWorldPubSubTypes.hpp | 12 +- test/blackbox/types/StringTestPubSubTypes.cxx | 102 +- test/blackbox/types/StringTestPubSubTypes.hpp | 12 +- .../types/TestRegression3361PubSubTypes.cxx | 102 +- .../types/TestRegression3361PubSubTypes.hpp | 12 +- .../types/UnboundedHelloWorldPubSubTypes.cxx | 102 +- .../types/UnboundedHelloWorldPubSubTypes.hpp | 12 +- .../types/core/core_typesPubSubTypes.cxx | 2300 +- .../types/core/core_typesPubSubTypes.hpp | 264 +- .../monitorservice_typesPubSubTypes.cxx | 714 +- .../monitorservice_typesPubSubTypes.hpp | 84 +- .../types/statistics/typesPubSubTypes.cxx | 1484 +- .../types/statistics/typesPubSubTypes.hpp | 168 +- test/dds-types-test/aliasesPubSubTypes.cxx | 2650 +- test/dds-types-test/aliasesPubSubTypes.hpp | 300 +- .../dds-types-test/annotationsPubSubTypes.cxx | 306 +- .../dds-types-test/annotationsPubSubTypes.hpp | 36 +- test/dds-types-test/appendablePubSubTypes.cxx | 2014 +- test/dds-types-test/appendablePubSubTypes.hpp | 228 +- test/dds-types-test/arraysPubSubTypes.cxx | 11038 +++---- test/dds-types-test/arraysPubSubTypes.hpp | 1248 +- test/dds-types-test/bitsetsPubSubTypes.cxx | 102 +- test/dds-types-test/bitsetsPubSubTypes.hpp | 12 +- test/dds-types-test/constantsPubSubTypes.cxx | 306 +- test/dds-types-test/constantsPubSubTypes.hpp | 36 +- .../declarationsPubSubTypes.cxx | 612 +- .../declarationsPubSubTypes.hpp | 72 +- .../enumerationsPubSubTypes.cxx | 306 +- .../enumerationsPubSubTypes.hpp | 36 +- test/dds-types-test/externalPubSubTypes.cxx | 2862 +- test/dds-types-test/externalPubSubTypes.hpp | 324 +- test/dds-types-test/finalPubSubTypes.cxx | 2014 +- test/dds-types-test/finalPubSubTypes.hpp | 228 +- .../helpers/basic_inner_typesPubSubTypes.cxx | 204 +- .../helpers/basic_inner_typesPubSubTypes.hpp | 24 +- .../dds-types-test/inheritancePubSubTypes.cxx | 848 +- .../dds-types-test/inheritancePubSubTypes.hpp | 96 +- test/dds-types-test/keyPubSubTypes.cxx | 1802 +- test/dds-types-test/keyPubSubTypes.hpp | 204 +- test/dds-types-test/mapsPubSubTypes.cxx | 26968 ++++++---------- test/dds-types-test/mapsPubSubTypes.hpp | 3144 +- test/dds-types-test/member_idPubSubTypes.cxx | 1272 +- test/dds-types-test/member_idPubSubTypes.hpp | 144 +- test/dds-types-test/mutablePubSubTypes.cxx | 2014 +- test/dds-types-test/mutablePubSubTypes.hpp | 228 +- test/dds-types-test/optionalPubSubTypes.cxx | 8262 ++--- test/dds-types-test/optionalPubSubTypes.hpp | 972 +- test/dds-types-test/primitivesPubSubTypes.cxx | 2226 +- test/dds-types-test/primitivesPubSubTypes.hpp | 252 +- .../relative_path_includePubSubTypes.cxx | 102 +- .../relative_path_includePubSubTypes.hpp | 12 +- test/dds-types-test/sequencesPubSubTypes.cxx | 2968 +- test/dds-types-test/sequencesPubSubTypes.hpp | 336 +- test/dds-types-test/stringsPubSubTypes.cxx | 612 +- test/dds-types-test/stringsPubSubTypes.hpp | 72 +- test/dds-types-test/structuresPubSubTypes.cxx | 3604 +-- test/dds-types-test/structuresPubSubTypes.hpp | 408 +- test/dds-types-test/unionsPubSubTypes.cxx | 4346 +-- test/dds-types-test/unionsPubSubTypes.hpp | 492 +- .../DynamicTypesDDSTypesTest.hpp | 8 +- .../dynamic_types/DynamicTypesTests.cpp | 10 +- .../latency/LatencyTestPublisher.cpp | 12 +- .../latency/LatencyTestSubscriber.cpp | 6 +- test/performance/latency/LatencyTestTypes.cpp | 31 +- test/performance/latency/LatencyTestTypes.hpp | 34 +- .../throughput/ThroughputPublisher.cpp | 2 +- .../throughput/ThroughputSubscriber.cpp | 2 +- .../throughput/ThroughputTypes.cpp | 33 +- .../throughput/ThroughputTypes.hpp | 28 +- test/profiling/MemoryTestTypes.cpp | 32 +- test/profiling/MemoryTestTypes.h | 32 +- .../allocations/AllocTestTypePubSubTypes.cxx | 102 +- .../allocations/AllocTestTypePubSubTypes.hpp | 12 +- .../dds/participant/ParticipantTests.cpp | 38 +- .../dds/publisher/DataWriterTests.cpp | 85 +- .../unittest/dds/publisher/PublisherTests.cpp | 31 +- test/unittest/dds/status/ListenerTests.cpp | 19 +- .../dds/subscriber/DataReaderHistoryTests.cpp | 14 +- .../dds/subscriber/DataReaderTests.cpp | 35 +- .../dds/subscriber/FooBoundedTypeSupport.hpp | 21 +- .../dds/subscriber/FooTypeSupport.hpp | 19 +- .../dds/subscriber/SubscriberTests.cpp | 19 +- .../topic/DDSSQLFilter/DDSSQLFilterTests.cpp | 2 +- .../ContentFilterTestTypePubSubTypes.cxx | 204 +- .../ContentFilterTestTypePubSubTypes.hpp | 24 +- test/unittest/dds/topic/TopicTests.cpp | 21 +- .../gen/ComprehensiveTypePubSubTypes.cxx | 306 +- .../gen/ComprehensiveTypePubSubTypes.hpp | 36 +- .../implementation/ComprehensiveTypeImpl.cpp | 2 +- ...sDomainParticipantStatusQueryableTests.cpp | 21 +- .../dds/StatisticsDomainParticipantTests.cpp | 29 +- 178 files changed, 40418 insertions(+), 70795 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx index 2c0854fb8bd..360be5699c8 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ConfigurationPubSubType::ConfigurationPubSubType() { - setName("Configuration"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Configuration::getMaxCdrSerializedSize()); -#else - Configuration_max_cdr_typesize; -#endif + set_name("Configuration"); + uint32_t type_size = Configuration_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Configuration_max_key_cdr_typesize > 16 ? Configuration_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Configuration_max_key_cdr_typesize > 16 ? Configuration_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ConfigurationPubSubType::~ConfigurationPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool ConfigurationPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool ConfigurationPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool ConfigurationPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool ConfigurationPubSubType::deserialize( return true; } -std::function ConfigurationPubSubType::getSerializedSizeProvider( +uint32_t ConfigurationPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ConfigurationPubSubType::createData() +void* ConfigurationPubSubType::create_data() { return reinterpret_cast(new Configuration()); } -void ConfigurationPubSubType::deleteData( +void ConfigurationPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ConfigurationPubSubType::getKey( +bool ConfigurationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool ConfigurationPubSubType::getKey( const Configuration* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Configuration_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 || Configuration_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index e459174ab5d..af9c04c5059 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -61,18 +61,18 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp index c91b27a4c30..4820797b3cf 100644 --- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp +++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp @@ -87,7 +87,7 @@ bool HelloWorldPublisher::init() return false; } - topic_ = mp_participant->create_topic("DDSDynHelloWorldTopic", m_type->getName(), TOPIC_QOS_DEFAULT); + topic_ = mp_participant->create_topic("DDSDynHelloWorldTopic", m_type->get_name(), TOPIC_QOS_DEFAULT); if (topic_ == nullptr) { diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp index f65d324a2cf..7dd61ab172f 100644 --- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp +++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp @@ -149,7 +149,7 @@ void HelloWorldSubscriber::initialize_entities() //CREATE THE TOPIC Topic* topic = mp_participant->create_topic( "DDSDynHelloWorldTopic", - m_type->getName(), + m_type->get_name(), TOPIC_QOS_DEFAULT); if (topic == nullptr) diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index a22a6f25267..4fe2ea7a1ce 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx index 7bde4db2c54..6f4ecc7565a 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; samplePubSubType::samplePubSubType() { - setName("sample"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sample::getMaxCdrSerializedSize()); -#else - sample_max_cdr_typesize; -#endif + set_name("sample"); + uint32_t type_size = sample_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = sample_max_key_cdr_typesize > 16 ? sample_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = sample_max_key_cdr_typesize > 16 ? sample_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } samplePubSubType::~samplePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool samplePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool samplePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool samplePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool samplePubSubType::deserialize( return true; } -std::function samplePubSubType::getSerializedSizeProvider( +uint32_t samplePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* samplePubSubType::createData() +void* samplePubSubType::create_data() { return reinterpret_cast(new sample()); } -void samplePubSubType::deleteData( +void samplePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool samplePubSubType::getKey( +bool samplePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool samplePubSubType::getKey( const sample* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sample_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 || sample_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index 2779a0ad901..3d5dd477f7f 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -61,18 +61,18 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx index d971e2e4f36..c59e014cc4d 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; LoanableHelloWorldPubSubType::LoanableHelloWorldPubSubType() { - setName("LoanableHelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LoanableHelloWorld::getMaxCdrSerializedSize()); -#else - LoanableHelloWorld_max_cdr_typesize; -#endif + set_name("LoanableHelloWorld"); + uint32_t type_size = LoanableHelloWorld_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LoanableHelloWorld_max_key_cdr_typesize > 16 ? LoanableHelloWorld_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LoanableHelloWorld_max_key_cdr_typesize > 16 ? LoanableHelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LoanableHelloWorldPubSubType::~LoanableHelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool LoanableHelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool LoanableHelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool LoanableHelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool LoanableHelloWorldPubSubType::deserialize( return true; } -std::function LoanableHelloWorldPubSubType::getSerializedSizeProvider( +uint32_t LoanableHelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* LoanableHelloWorldPubSubType::createData() +void* LoanableHelloWorldPubSubType::create_data() { return reinterpret_cast(new LoanableHelloWorld()); } -void LoanableHelloWorldPubSubType::deleteData( +void LoanableHelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LoanableHelloWorldPubSubType::getKey( +bool LoanableHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool LoanableHelloWorldPubSubType::getKey( const LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LoanableHelloWorld_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 || LoanableHelloWorld_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index fe0b9d78efb..c6acedce0b8 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -94,18 +94,18 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -146,8 +146,8 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx index d971e2e4f36..c59e014cc4d 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; LoanableHelloWorldPubSubType::LoanableHelloWorldPubSubType() { - setName("LoanableHelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LoanableHelloWorld::getMaxCdrSerializedSize()); -#else - LoanableHelloWorld_max_cdr_typesize; -#endif + set_name("LoanableHelloWorld"); + uint32_t type_size = LoanableHelloWorld_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LoanableHelloWorld_max_key_cdr_typesize > 16 ? LoanableHelloWorld_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LoanableHelloWorld_max_key_cdr_typesize > 16 ? LoanableHelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LoanableHelloWorldPubSubType::~LoanableHelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool LoanableHelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool LoanableHelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool LoanableHelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool LoanableHelloWorldPubSubType::deserialize( return true; } -std::function LoanableHelloWorldPubSubType::getSerializedSizeProvider( +uint32_t LoanableHelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* LoanableHelloWorldPubSubType::createData() +void* LoanableHelloWorldPubSubType::create_data() { return reinterpret_cast(new LoanableHelloWorld()); } -void LoanableHelloWorldPubSubType::deleteData( +void LoanableHelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LoanableHelloWorldPubSubType::getKey( +bool LoanableHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool LoanableHelloWorldPubSubType::getKey( const LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LoanableHelloWorld_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 || LoanableHelloWorld_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index fe0b9d78efb..c6acedce0b8 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -94,18 +94,18 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -146,8 +146,8 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx index 1525521fa8b..bc67039570a 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; DeliveryMechanismsPubSubType::DeliveryMechanismsPubSubType() { - setName("DeliveryMechanisms"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DeliveryMechanisms::getMaxCdrSerializedSize()); -#else - DeliveryMechanisms_max_cdr_typesize; -#endif + set_name("DeliveryMechanisms"); + uint32_t type_size = DeliveryMechanisms_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DeliveryMechanisms_max_key_cdr_typesize > 16 ? DeliveryMechanisms_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DeliveryMechanisms_max_key_cdr_typesize > 16 ? DeliveryMechanisms_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DeliveryMechanismsPubSubType::~DeliveryMechanismsPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool DeliveryMechanismsPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool DeliveryMechanismsPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool DeliveryMechanismsPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool DeliveryMechanismsPubSubType::deserialize( return true; } -std::function DeliveryMechanismsPubSubType::getSerializedSizeProvider( +uint32_t DeliveryMechanismsPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* DeliveryMechanismsPubSubType::createData() +void* DeliveryMechanismsPubSubType::create_data() { return reinterpret_cast(new DeliveryMechanisms()); } -void DeliveryMechanismsPubSubType::deleteData( +void DeliveryMechanismsPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DeliveryMechanismsPubSubType::getKey( +bool DeliveryMechanismsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool DeliveryMechanismsPubSubType::getKey( const DeliveryMechanisms* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DeliveryMechanisms_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 || DeliveryMechanisms_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 5a946a76447..14c2530f450 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -94,18 +94,18 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -146,8 +146,8 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx index 6bacf3ded72..9af0fbb057b 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FlowControlPubSubType::FlowControlPubSubType() { - setName("FlowControl"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FlowControl::getMaxCdrSerializedSize()); -#else - FlowControl_max_cdr_typesize; -#endif + set_name("FlowControlExample"); + uint32_t type_size = FlowControlExample_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FlowControl_max_key_cdr_typesize > 16 ? FlowControl_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FlowControlExample_max_key_cdr_typesize > 16 ? FlowControlExample_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FlowControlPubSubType::~FlowControlPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool FlowControlPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool FlowControlPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool FlowControlPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool FlowControlPubSubType::deserialize( return true; } -std::function FlowControlPubSubType::getSerializedSizeProvider( +uint32_t FlowControlExamplePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* FlowControlPubSubType::createData() +void* FlowControlExamplePubSubType::create_data() { return reinterpret_cast(new FlowControl()); } -void FlowControlPubSubType::deleteData( +void FlowControlExamplePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FlowControlPubSubType::getKey( +bool FlowControlExamplePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,28 @@ bool FlowControlPubSubType::getKey( const FlowControl* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), - FlowControl_max_key_cdr_typesize); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + FlowControlExample_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::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, + eprosima::fastcdr::CdrVersion::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); -#endif // FASTCDR_VERSION_MAJOR == 1 - if (force_md5 || FlowControl_max_key_cdr_typesize > 16) + if (force_md5 || FlowControlExample_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -224,6 +193,5 @@ void FlowControlPubSubType::register_type_object_representation() register_FlowControl_type_identifier(type_identifiers_); } - // Include auxiliary functions like for serializing/deserializing. #include "FlowControlCdrAux.ipp" diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index 591cc6f5cd8..d6157290bfe 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -61,18 +61,18 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx index 28b085a472b..43d319889aa 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; CalculatorRequestTypePubSubType::CalculatorRequestTypePubSubType() { - setName("CalculatorRequestType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CalculatorRequestType::getMaxCdrSerializedSize()); -#else - CalculatorRequestType_max_cdr_typesize; -#endif + set_name("RequestType"); + uint32_t type_size = RequestType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = CalculatorRequestType_max_key_cdr_typesize > 16 ? CalculatorRequestType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = RequestType_max_key_cdr_typesize > 16 ? RequestType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CalculatorRequestTypePubSubType::~CalculatorRequestTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool CalculatorRequestTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool CalculatorRequestTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool CalculatorRequestTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool CalculatorRequestTypePubSubType::deserialize( return true; } -std::function CalculatorRequestTypePubSubType::getSerializedSizeProvider( +uint32_t RequestTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* CalculatorRequestTypePubSubType::createData() +void* RequestTypePubSubType::create_data() { return reinterpret_cast(new CalculatorRequestType()); } -void CalculatorRequestTypePubSubType::deleteData( +void RequestTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CalculatorRequestTypePubSubType::getKey( +bool RequestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,28 @@ bool CalculatorRequestTypePubSubType::getKey( const CalculatorRequestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), - CalculatorRequestType_max_key_cdr_typesize); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + RequestType_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::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, + eprosima::fastcdr::CdrVersion::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); -#endif // FASTCDR_VERSION_MAJOR == 1 - if (force_md5 || CalculatorRequestType_max_key_cdr_typesize > 16) + if (force_md5 || RequestType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +195,21 @@ void CalculatorRequestTypePubSubType::register_type_object_representation() CalculatorReplyTypePubSubType::CalculatorReplyTypePubSubType() { - setName("CalculatorReplyType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CalculatorReplyType::getMaxCdrSerializedSize()); -#else - CalculatorReplyType_max_cdr_typesize; -#endif + set_name("ReplyType"); + uint32_t type_size = ReplyType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = CalculatorReplyType_max_key_cdr_typesize > 16 ? CalculatorReplyType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ReplyType_max_key_cdr_typesize > 16 ? ReplyType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CalculatorReplyTypePubSubType::~CalculatorReplyTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +227,10 @@ bool CalculatorReplyTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +245,7 @@ bool CalculatorReplyTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +262,7 @@ bool CalculatorReplyTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +279,43 @@ bool CalculatorReplyTypePubSubType::deserialize( return true; } -std::function CalculatorReplyTypePubSubType::getSerializedSizeProvider( +uint32_t ReplyTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* CalculatorReplyTypePubSubType::createData() +void* ReplyTypePubSubType::create_data() { return reinterpret_cast(new CalculatorReplyType()); } -void CalculatorReplyTypePubSubType::deleteData( +void ReplyTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CalculatorReplyTypePubSubType::getKey( +bool ReplyTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +323,28 @@ bool CalculatorReplyTypePubSubType::getKey( const CalculatorReplyType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), - CalculatorReplyType_max_key_cdr_typesize); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + ReplyType_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::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, + eprosima::fastcdr::CdrVersion::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); -#endif // FASTCDR_VERSION_MAJOR == 1 - if (force_md5 || CalculatorReplyType_max_key_cdr_typesize > 16) + if (force_md5 || ReplyType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -417,6 +355,5 @@ void CalculatorReplyTypePubSubType::register_type_object_representation() register_CalculatorReplyType_type_identifier(type_identifiers_); } - // Include auxiliary functions like for serializing/deserializing. #include "CalculatorCdrAux.ipp" diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index 1a61dc56081..ad2dd286d13 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -61,18 +61,18 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -135,18 +135,18 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -181,8 +181,8 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/security/HelloWorldPubSubTypes.cxx b/examples/cpp/security/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/security/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx index 38393dbf8c9..fd0272ad93e 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index b0e890c5ce2..7d0e16649d7 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 9748813378e..efab5b39316 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -64,7 +64,7 @@ class TopicDataType /** * @brief Constructor */ - FASTDDS_EXPORTED_API TopicDataType(); + FASTDDS_EXPORTED_API TopicDataType() = default; /** * @brief Destructor @@ -98,13 +98,13 @@ class TopicDataType void* data) = 0; /*! - * @brief Returns a function which can be used to calculate the serialized size of the provided data. + * @brief Calculates the serialized size of the provided data. * * @param [in] data Pointer to data. * @param [in] data_representation Representation that should be used for calculating the serialized size. - * @return Functor which calculates the serialized size of the data. + * @return Serialized size of the data. */ - FASTDDS_EXPORTED_API virtual std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API virtual uint32_t calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) = 0; @@ -113,13 +113,13 @@ class TopicDataType * * @return Void pointer to the created object. */ - FASTDDS_EXPORTED_API virtual void* createData() = 0; + FASTDDS_EXPORTED_API virtual void* create_data() = 0; /** * Remove a previously created object. * * @param data Pointer to the created Data. */ - FASTDDS_EXPORTED_API virtual void deleteData( + FASTDDS_EXPORTED_API virtual void delete_data( void* data) = 0; /** @@ -130,7 +130,7 @@ class TopicDataType * @param [in] force_md5 Force MD5 checking. * @return True if correct. */ - FASTDDS_EXPORTED_API virtual bool getKey( + FASTDDS_EXPORTED_API virtual bool compute_key( const void* const data, fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) = 0; @@ -140,10 +140,10 @@ class TopicDataType * * @param nam Topic data type name */ - FASTDDS_EXPORTED_API inline void setName( + FASTDDS_EXPORTED_API inline void set_name( const char* nam) { - m_topicDataTypeName = std::string(nam); + topic_data_typename_ = std::string(nam); } /** @@ -151,9 +151,9 @@ class TopicDataType * * @return Topic data type name */ - FASTDDS_EXPORTED_API inline const char* getName() const + FASTDDS_EXPORTED_API inline const char* get_name() const { - return m_topicDataTypeName.c_str(); + return topic_data_typename_.c_str(); } /** @@ -227,10 +227,10 @@ class TopicDataType //! Maximum serialized size of the type in bytes. //! If the type has unbounded fields, and therefore cannot have a maximum size, use 0. - uint32_t m_typeSize; + uint32_t max_serialized_type_size {0}; //! Indicates whether the method to obtain the key has been implemented. - bool m_isGetKeyDefined; + bool is_compute_key_provided {false}; protected: @@ -239,9 +239,9 @@ class TopicDataType private: //! Data Type Name. - std::string m_topicDataTypeName; + std::string topic_data_typename_; //TODO(XTypes) - bool auto_fill_type_information_; + bool auto_fill_type_information_ {true}; friend class fastdds::dds::TypeSupport; diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index b58b50c0b32..9396e6b09fc 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -128,7 +128,7 @@ class TypeSupport : public std::shared_ptr */ FASTDDS_EXPORTED_API virtual const std::string& get_type_name() const { - return get()->m_topicDataTypeName; + return get()->topic_data_typename_; } /** @@ -170,11 +170,11 @@ class TypeSupport : public std::shared_ptr * @param [in] data_representation Representation that should be used for calculating the serialized size. * @return Functor which calculates the serialized size of the data. */ - FASTDDS_EXPORTED_API virtual std::function get_serialized_size_provider( + FASTDDS_EXPORTED_API virtual uint32_t calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return get()->getSerializedSizeProvider(data, data_representation); + return get()->calculate_serialized_size(data, data_representation); } /** @@ -184,7 +184,7 @@ class TypeSupport : public std::shared_ptr */ FASTDDS_EXPORTED_API virtual void* create_data() { - return get()->createData(); + return get()->create_data(); } /** @@ -195,7 +195,7 @@ class TypeSupport : public std::shared_ptr FASTDDS_EXPORTED_API virtual void delete_data( void* data) { - return get()->deleteData(data); + return get()->delete_data(data); } /** @@ -206,20 +206,20 @@ class TypeSupport : public std::shared_ptr * @param force_md5 boolean to force md5 (default: false) * @return true if the key is returned, false if not */ - FASTDDS_EXPORTED_API virtual bool get_key( + FASTDDS_EXPORTED_API virtual bool compute_key( void* data, InstanceHandle_t* i_handle, bool force_md5 = false) { - return get()->getKey(data, i_handle, force_md5); + return get()->compute_key(data, i_handle, force_md5); } FASTDDS_EXPORTED_API virtual bool operator ==( const TypeSupport& type_support) { - return get()->m_typeSize == type_support->m_typeSize - && get()->m_isGetKeyDefined == type_support->m_isGetKeyDefined - && get()->m_topicDataTypeName == type_support->m_topicDataTypeName + return get()->max_serialized_type_size == type_support->max_serialized_type_size + && get()->is_compute_key_provided == type_support->is_compute_key_provided + && get()->topic_data_typename_ == type_support->topic_data_typename_ && get()->type_identifiers_ == type_support->type_identifiers_; } diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp index 331f5c3da25..5cb27b771b4 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp @@ -56,14 +56,14 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType * @return pointer to the new object * @remark Ownership is transferred. This object must be removed using @ref deleteData */ - FASTDDS_EXPORTED_API void* createData() override; + FASTDDS_EXPORTED_API void* create_data() override; /* * Deletes an object previously allocated via @ref createData * @param data pointer to the object to be deleted * @remark Ownership is transferred. This object must be allocated using @ref createData */ - FASTDDS_EXPORTED_API void deleteData ( + FASTDDS_EXPORTED_API void delete_data ( void* data) override; /* @@ -89,7 +89,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType * @param force_md5 use always md5 even if key payload footprint is smaller than the hash * @return bool specifying success */ - FASTDDS_EXPORTED_API bool getKey( + FASTDDS_EXPORTED_API bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; @@ -100,7 +100,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType * @param [in] data_representation Representation that should be used for calculating the serialized size. * @return functor that calculates the size */ - FASTDDS_EXPORTED_API std::function getSerializedSizeProvider( + FASTDDS_EXPORTED_API uint32_t calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) override; diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index 62f149cfe71..3bd89426f2e 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -185,18 +185,18 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -237,8 +237,8 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -314,18 +314,18 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -366,8 +366,8 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -410,18 +410,18 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -456,8 +456,8 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -484,18 +484,18 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -530,8 +530,8 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -558,18 +558,18 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -604,8 +604,8 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -632,18 +632,18 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -678,8 +678,8 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -706,18 +706,18 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -752,8 +752,8 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -780,18 +780,18 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -826,8 +826,8 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -854,18 +854,18 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -900,8 +900,8 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -928,18 +928,18 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -974,8 +974,8 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1002,18 +1002,18 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1048,8 +1048,8 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1076,18 +1076,18 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1128,8 +1128,8 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1173,18 +1173,18 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1219,8 +1219,8 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1248,18 +1248,18 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1294,8 +1294,8 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector AppliedAnnotationParameterSeq; @@ -1323,18 +1323,18 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1369,8 +1369,8 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector AppliedAnnotationSeq; @@ -1398,18 +1398,18 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1444,8 +1444,8 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1472,18 +1472,18 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1518,8 +1518,8 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1546,18 +1546,18 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1592,8 +1592,8 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1620,18 +1620,18 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1666,8 +1666,8 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1727,18 +1727,18 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1779,8 +1779,8 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1823,18 +1823,18 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1869,8 +1869,8 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteStructMemberSeq; @@ -1898,18 +1898,18 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1944,8 +1944,8 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalStructMemberSeq; @@ -1973,18 +1973,18 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2019,8 +2019,8 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2047,18 +2047,18 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2099,8 +2099,8 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -2139,18 +2139,18 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2185,8 +2185,8 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2213,18 +2213,18 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2259,8 +2259,8 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2287,18 +2287,18 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2333,8 +2333,8 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2361,18 +2361,18 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2407,8 +2407,8 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2435,18 +2435,18 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2481,8 +2481,8 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector UnionCaseLabelSeq; @@ -2510,18 +2510,18 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2556,8 +2556,8 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2584,18 +2584,18 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2630,8 +2630,8 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteUnionMemberSeq; @@ -2659,18 +2659,18 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2705,8 +2705,8 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalUnionMemberSeq; @@ -2734,18 +2734,18 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2780,8 +2780,8 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2808,18 +2808,18 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2854,8 +2854,8 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2882,18 +2882,18 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2928,8 +2928,8 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2956,18 +2956,18 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3002,8 +3002,8 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3030,18 +3030,18 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3076,8 +3076,8 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3104,18 +3104,18 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3150,8 +3150,8 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3178,18 +3178,18 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3224,8 +3224,8 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3252,18 +3252,18 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3298,8 +3298,8 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3326,18 +3326,18 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3372,8 +3372,8 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteAnnotationParameterSeq; @@ -3401,18 +3401,18 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3447,8 +3447,8 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalAnnotationParameterSeq; @@ -3476,18 +3476,18 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3522,8 +3522,8 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3550,18 +3550,18 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3596,8 +3596,8 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3624,18 +3624,18 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3670,8 +3670,8 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3698,18 +3698,18 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3744,8 +3744,8 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3772,18 +3772,18 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3818,8 +3818,8 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3846,18 +3846,18 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3892,8 +3892,8 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3920,18 +3920,18 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3966,8 +3966,8 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3994,18 +3994,18 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4040,8 +4040,8 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4068,18 +4068,18 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4114,8 +4114,8 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4142,18 +4142,18 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4188,8 +4188,8 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4216,18 +4216,18 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4262,8 +4262,8 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4290,18 +4290,18 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4336,8 +4336,8 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4364,18 +4364,18 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4410,8 +4410,8 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4438,18 +4438,18 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4484,8 +4484,8 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4512,18 +4512,18 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4558,8 +4558,8 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4619,18 +4619,18 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4671,8 +4671,8 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -4715,18 +4715,18 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4761,8 +4761,8 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4789,18 +4789,18 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4835,8 +4835,8 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4863,18 +4863,18 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4909,8 +4909,8 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4937,18 +4937,18 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4983,8 +4983,8 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5011,18 +5011,18 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5057,8 +5057,8 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5085,18 +5085,18 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5131,8 +5131,8 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5159,18 +5159,18 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5205,8 +5205,8 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5233,18 +5233,18 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5279,8 +5279,8 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5307,18 +5307,18 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5353,8 +5353,8 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5381,18 +5381,18 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5427,8 +5427,8 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5455,18 +5455,18 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5501,8 +5501,8 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef uint16_t BitBound; @@ -5530,18 +5530,18 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5576,8 +5576,8 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5604,18 +5604,18 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5650,8 +5650,8 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteEnumeratedLiteralSeq; @@ -5679,18 +5679,18 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5725,8 +5725,8 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalEnumeratedLiteralSeq; @@ -5787,18 +5787,18 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5839,8 +5839,8 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -5883,18 +5883,18 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5929,8 +5929,8 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5957,18 +5957,18 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6003,8 +6003,8 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6031,18 +6031,18 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6077,8 +6077,8 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6105,18 +6105,18 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6151,8 +6151,8 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6179,18 +6179,18 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6225,8 +6225,8 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6253,18 +6253,18 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6299,8 +6299,8 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteBitflagSeq; @@ -6328,18 +6328,18 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6374,8 +6374,8 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalBitflagSeq; @@ -6436,18 +6436,18 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6488,8 +6488,8 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -6534,18 +6534,18 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6580,8 +6580,8 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6608,18 +6608,18 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6654,8 +6654,8 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6682,18 +6682,18 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6728,8 +6728,8 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6756,18 +6756,18 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6802,8 +6802,8 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector CompleteBitfieldSeq; @@ -6831,18 +6831,18 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6877,8 +6877,8 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector MinimalBitfieldSeq; @@ -6906,18 +6906,18 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6952,8 +6952,8 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6980,18 +6980,18 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7026,8 +7026,8 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7054,18 +7054,18 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7100,8 +7100,8 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7128,18 +7128,18 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7174,8 +7174,8 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7202,18 +7202,18 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7248,8 +7248,8 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7277,18 +7277,18 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7323,8 +7323,8 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7355,18 +7355,18 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7401,8 +7401,8 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector TypeIdentifierTypeObjectPairSeq; @@ -7430,18 +7430,18 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7476,8 +7476,8 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector TypeIdentifierPairSeq; @@ -7505,18 +7505,18 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7551,8 +7551,8 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector TypeIdentfierWithSizeSeq; @@ -7580,18 +7580,18 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7626,8 +7626,8 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector TypeIdentifierWithDependenciesSeq; @@ -7655,18 +7655,18 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7701,8 +7701,8 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector TypeInformationSeq; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp index 68b7dfea023..dd97d324c3f 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp @@ -279,7 +279,7 @@ SampleIdentity TypeLookupManager::get_type_dependencies( id = request->header().requestId(); } // Delete request data after sending - type.deleteData(request); + type.delete_data(request); return id; } @@ -303,7 +303,7 @@ SampleIdentity TypeLookupManager::get_types( id = request->header().requestId(); } // Delete request data after sending - type.deleteData(request); + type.delete_data(request); return id; } @@ -669,7 +669,7 @@ TypeLookup_Request* TypeLookupManager::create_request( const fastdds::rtps::GUID_t& type_server, TypeLookup_RequestPubSubType& pupsubtype) const { - TypeLookup_Request* request = static_cast(pupsubtype.createData()); + TypeLookup_Request* request = static_cast(pupsubtype.create_data()); request->header().instanceName() = get_instance_name(type_server); request->header().requestId().writer_guid(guid_rtps_2_dds(builtin_request_writer_->getGuid())); request->header().requestId().sequence_number(sequence_number_rtps_2_dds(request_seq_number_)); diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp index 91115d1bb27..05cd2735075 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp @@ -379,7 +379,7 @@ void TypeLookupRequestListener::answer_request( rpc::RemoteExceptionCode_t exception_code, TypeLookup_getTypeDependencies_Out& out) { - TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.createData()); + TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.create_data()); TypeLookup_getTypeDependencies_Result result; result.result(out); reply->return_value().getTypeDependencies(result); @@ -387,7 +387,7 @@ void TypeLookupRequestListener::answer_request( reply->header().remoteEx(exception_code); typelookup_manager_->send(*reply); - typelookup_manager_->reply_type_.deleteData(reply); + typelookup_manager_->reply_type_.delete_data(reply); } void TypeLookupRequestListener::answer_request( @@ -395,7 +395,7 @@ void TypeLookupRequestListener::answer_request( rpc::RemoteExceptionCode_t exception_code, TypeLookup_getTypes_Out& out) { - TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.createData()); + TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.create_data()); TypeLookup_getTypes_Result result; result.result(out); reply->return_value().getType(result); @@ -403,19 +403,19 @@ void TypeLookupRequestListener::answer_request( reply->header().remoteEx(exception_code); typelookup_manager_->send(*reply); - typelookup_manager_->reply_type_.deleteData(reply); + typelookup_manager_->reply_type_.delete_data(reply); } void TypeLookupRequestListener::answer_request( SampleIdentity request_id, rpc::RemoteExceptionCode_t exception_code) { - TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.createData()); + TypeLookup_Reply* reply = static_cast(typelookup_manager_->reply_type_.create_data()); reply->header().relatedRequestId(request_id); reply->header().remoteEx(exception_code); typelookup_manager_->send(*reply); - typelookup_manager_->reply_type_.deleteData(reply); + typelookup_manager_->reply_type_.delete_data(reply); } void TypeLookupRequestListener::on_new_cache_change_added( diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx index 8f6eba8a973..0c55b8b6acf 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx @@ -39,26 +39,21 @@ namespace dds { namespace builtin { TypeLookup_getTypes_InPubSubType::TypeLookup_getTypes_InPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_getTypes_In"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_getTypes_In::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_getTypes_In"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_getTypes_InPubSubType::~TypeLookup_getTypes_InPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -76,12 +71,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -96,11 +89,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -117,11 +106,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -138,52 +123,43 @@ namespace builtin { return true; } - std::function TypeLookup_getTypes_InPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_getTypes_InPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_getTypes_InPubSubType::createData() + void* TypeLookup_getTypes_InPubSubType::create_data() { return reinterpret_cast(new TypeLookup_getTypes_In()); } - void TypeLookup_getTypes_InPubSubType::deleteData( + void TypeLookup_getTypes_InPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_getTypes_InPubSubType::getKey( + bool TypeLookup_getTypes_InPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -191,35 +167,27 @@ namespace builtin { const TypeLookup_getTypes_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_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 || eprosima_fastdds_dds_builtin_TypeLookup_getTypes_In_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -233,26 +201,21 @@ namespace builtin { TypeLookup_getTypes_OutPubSubType::TypeLookup_getTypes_OutPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_getTypes_Out::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_getTypes_OutPubSubType::~TypeLookup_getTypes_OutPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -270,12 +233,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -290,11 +251,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -311,11 +268,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -332,52 +285,43 @@ namespace builtin { return true; } - std::function TypeLookup_getTypes_OutPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_getTypes_OutPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_getTypes_OutPubSubType::createData() + void* TypeLookup_getTypes_OutPubSubType::create_data() { return reinterpret_cast(new TypeLookup_getTypes_Out()); } - void TypeLookup_getTypes_OutPubSubType::deleteData( + void TypeLookup_getTypes_OutPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_getTypes_OutPubSubType::getKey( + bool TypeLookup_getTypes_OutPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -385,35 +329,27 @@ namespace builtin { const TypeLookup_getTypes_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_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 || eprosima_fastdds_dds_builtin_TypeLookup_getTypes_Out_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -428,26 +364,21 @@ namespace builtin { TypeLookup_getTypeDependencies_InPubSubType::TypeLookup_getTypeDependencies_InPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_getTypeDependencies_In::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_getTypeDependencies_InPubSubType::~TypeLookup_getTypeDependencies_InPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -465,12 +396,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -485,11 +414,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -506,11 +431,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -527,52 +448,43 @@ namespace builtin { return true; } - std::function TypeLookup_getTypeDependencies_InPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_getTypeDependencies_InPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_getTypeDependencies_InPubSubType::createData() + void* TypeLookup_getTypeDependencies_InPubSubType::create_data() { return reinterpret_cast(new TypeLookup_getTypeDependencies_In()); } - void TypeLookup_getTypeDependencies_InPubSubType::deleteData( + void TypeLookup_getTypeDependencies_InPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_getTypeDependencies_InPubSubType::getKey( + bool TypeLookup_getTypeDependencies_InPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -580,35 +492,27 @@ namespace builtin { const TypeLookup_getTypeDependencies_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_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 || eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_In_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -622,26 +526,21 @@ namespace builtin { TypeLookup_getTypeDependencies_OutPubSubType::TypeLookup_getTypeDependencies_OutPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_getTypeDependencies_Out::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_getTypeDependencies_OutPubSubType::~TypeLookup_getTypeDependencies_OutPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -659,12 +558,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -679,11 +576,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -700,11 +593,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -721,52 +610,43 @@ namespace builtin { return true; } - std::function TypeLookup_getTypeDependencies_OutPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_getTypeDependencies_OutPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_getTypeDependencies_OutPubSubType::createData() + void* TypeLookup_getTypeDependencies_OutPubSubType::create_data() { return reinterpret_cast(new TypeLookup_getTypeDependencies_Out()); } - void TypeLookup_getTypeDependencies_OutPubSubType::deleteData( + void TypeLookup_getTypeDependencies_OutPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_getTypeDependencies_OutPubSubType::getKey( + bool TypeLookup_getTypeDependencies_OutPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -774,35 +654,27 @@ namespace builtin { const TypeLookup_getTypeDependencies_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_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 || eprosima_fastdds_dds_builtin_TypeLookup_getTypeDependencies_Out_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -818,26 +690,21 @@ namespace builtin { TypeLookup_RequestPubSubType::TypeLookup_RequestPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_Request"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_Request::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_Request_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_Request"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_Request_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_Request_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_Request_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_Request_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_Request_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_RequestPubSubType::~TypeLookup_RequestPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -855,12 +722,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -875,11 +740,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -896,11 +757,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -917,52 +774,43 @@ namespace builtin { return true; } - std::function TypeLookup_RequestPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_RequestPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_RequestPubSubType::createData() + void* TypeLookup_RequestPubSubType::create_data() { return reinterpret_cast(new TypeLookup_Request()); } - void TypeLookup_RequestPubSubType::deleteData( + void TypeLookup_RequestPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_RequestPubSubType::getKey( + bool TypeLookup_RequestPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -970,35 +818,27 @@ namespace builtin { const TypeLookup_Request* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_Request_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 || eprosima_fastdds_dds_builtin_TypeLookup_Request_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1013,26 +853,21 @@ namespace builtin { TypeLookup_ReplyPubSubType::TypeLookup_ReplyPubSubType() { - setName("eprosima::fastdds::dds::builtin::TypeLookup_Reply"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeLookup_Reply::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::builtin::TypeLookup_Reply"); + uint32_t type_size = eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeLookup_ReplyPubSubType::~TypeLookup_ReplyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1050,12 +885,10 @@ namespace builtin { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1070,11 +903,7 @@ namespace builtin { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1091,11 +920,7 @@ namespace builtin { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1112,52 +937,43 @@ namespace builtin { return true; } - std::function TypeLookup_ReplyPubSubType::getSerializedSizeProvider( + uint32_t TypeLookup_ReplyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* TypeLookup_ReplyPubSubType::createData() + void* TypeLookup_ReplyPubSubType::create_data() { return reinterpret_cast(new TypeLookup_Reply()); } - void TypeLookup_ReplyPubSubType::deleteData( + void TypeLookup_ReplyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool TypeLookup_ReplyPubSubType::getKey( + bool TypeLookup_ReplyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1165,35 +981,27 @@ namespace builtin { const TypeLookup_Reply* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_builtin_TypeLookup_Reply_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 || eprosima_fastdds_dds_builtin_TypeLookup_Reply_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index dc34b6a3387..e54d2c46bfe 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -73,18 +73,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -119,8 +119,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -147,18 +147,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -193,8 +193,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -222,18 +222,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -268,8 +268,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -296,18 +296,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -342,8 +342,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -372,18 +372,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -418,8 +418,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -447,18 +447,18 @@ namespace builtin eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -493,8 +493,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace builtin diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx index d7a3435aba9..abde694c14f 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx @@ -38,26 +38,21 @@ namespace dds { EntityId_tPubSubType::EntityId_tPubSubType() { - setName("eprosima::fastdds::dds::EntityId_t"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityId_t::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_EntityId_t_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::EntityId_t"); + uint32_t type_size = eprosima_fastdds_dds_EntityId_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_EntityId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_EntityId_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_EntityId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_EntityId_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityId_tPubSubType::~EntityId_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -75,12 +70,10 @@ bool EntityId_tPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -95,11 +88,7 @@ bool EntityId_tPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -116,11 +105,7 @@ bool EntityId_tPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -137,52 +122,43 @@ bool EntityId_tPubSubType::deserialize( return true; } -std::function EntityId_tPubSubType::getSerializedSizeProvider( +uint32_t EntityId_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* EntityId_tPubSubType::createData() +void* EntityId_tPubSubType::create_data() { return reinterpret_cast(new EntityId_t()); } -void EntityId_tPubSubType::deleteData( +void EntityId_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool EntityId_tPubSubType::getKey( +bool EntityId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -190,35 +166,27 @@ bool EntityId_tPubSubType::getKey( const EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_EntityId_t_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 || eprosima_fastdds_dds_EntityId_t_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -232,26 +200,21 @@ void EntityId_tPubSubType::register_type_object_representation() GUID_tPubSubType::GUID_tPubSubType() { - setName("eprosima::fastdds::dds::GUID_t"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(GUID_t::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_GUID_t_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::GUID_t"); + uint32_t type_size = eprosima_fastdds_dds_GUID_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_GUID_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_GUID_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_GUID_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_GUID_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GUID_tPubSubType::~GUID_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -269,12 +232,10 @@ bool GUID_tPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -289,11 +250,7 @@ bool GUID_tPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -310,11 +267,7 @@ bool GUID_tPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -331,52 +284,43 @@ bool GUID_tPubSubType::deserialize( return true; } -std::function GUID_tPubSubType::getSerializedSizeProvider( +uint32_t GUID_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* GUID_tPubSubType::createData() +void* GUID_tPubSubType::create_data() { return reinterpret_cast(new GUID_t()); } -void GUID_tPubSubType::deleteData( +void GUID_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool GUID_tPubSubType::getKey( +bool GUID_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -384,35 +328,27 @@ bool GUID_tPubSubType::getKey( const GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_GUID_t_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 || eprosima_fastdds_dds_GUID_t_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -426,26 +362,21 @@ void GUID_tPubSubType::register_type_object_representation() SequenceNumber_tPubSubType::SequenceNumber_tPubSubType() { - setName("eprosima::fastdds::dds::SequenceNumber_t"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceNumber_t::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_SequenceNumber_t_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::SequenceNumber_t"); + uint32_t type_size = eprosima_fastdds_dds_SequenceNumber_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_SequenceNumber_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_SequenceNumber_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_SequenceNumber_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_SequenceNumber_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceNumber_tPubSubType::~SequenceNumber_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -463,12 +394,10 @@ bool SequenceNumber_tPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -483,11 +412,7 @@ bool SequenceNumber_tPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -504,11 +429,7 @@ bool SequenceNumber_tPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -525,52 +446,43 @@ bool SequenceNumber_tPubSubType::deserialize( return true; } -std::function SequenceNumber_tPubSubType::getSerializedSizeProvider( +uint32_t SequenceNumber_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* SequenceNumber_tPubSubType::createData() +void* SequenceNumber_tPubSubType::create_data() { return reinterpret_cast(new SequenceNumber_t()); } -void SequenceNumber_tPubSubType::deleteData( +void SequenceNumber_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceNumber_tPubSubType::getKey( +bool SequenceNumber_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -578,35 +490,27 @@ bool SequenceNumber_tPubSubType::getKey( const SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_SequenceNumber_t_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 || eprosima_fastdds_dds_SequenceNumber_t_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -620,26 +524,21 @@ void SequenceNumber_tPubSubType::register_type_object_representation() SampleIdentityPubSubType::SampleIdentityPubSubType() { - setName("eprosima::fastdds::dds::SampleIdentity"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SampleIdentity::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_SampleIdentity_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::SampleIdentity"); + uint32_t type_size = eprosima_fastdds_dds_SampleIdentity_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_SampleIdentity_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_SampleIdentity_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_SampleIdentity_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_SampleIdentity_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SampleIdentityPubSubType::~SampleIdentityPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -657,12 +556,10 @@ bool SampleIdentityPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -677,11 +574,7 @@ bool SampleIdentityPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -698,11 +591,7 @@ bool SampleIdentityPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -719,52 +608,43 @@ bool SampleIdentityPubSubType::deserialize( return true; } -std::function SampleIdentityPubSubType::getSerializedSizeProvider( +uint32_t SampleIdentityPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* SampleIdentityPubSubType::createData() +void* SampleIdentityPubSubType::create_data() { return reinterpret_cast(new SampleIdentity()); } -void SampleIdentityPubSubType::deleteData( +void SampleIdentityPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SampleIdentityPubSubType::getKey( +bool SampleIdentityPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -772,35 +652,27 @@ bool SampleIdentityPubSubType::getKey( const SampleIdentity* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_SampleIdentity_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 || eprosima_fastdds_dds_SampleIdentity_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -815,26 +687,21 @@ void SampleIdentityPubSubType::register_type_object_representation() namespace rpc { RequestHeaderPubSubType::RequestHeaderPubSubType() { - setName("eprosima::fastdds::dds::rpc::RequestHeader"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(RequestHeader::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_rpc_RequestHeader_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::rpc::RequestHeader"); + uint32_t type_size = eprosima_fastdds_dds_rpc_RequestHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_rpc_RequestHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_rpc_RequestHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_rpc_RequestHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_rpc_RequestHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } RequestHeaderPubSubType::~RequestHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -852,12 +719,10 @@ namespace rpc { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -872,11 +737,7 @@ namespace rpc { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -893,11 +754,7 @@ namespace rpc { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -914,52 +771,43 @@ namespace rpc { return true; } - std::function RequestHeaderPubSubType::getSerializedSizeProvider( + uint32_t RequestHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* RequestHeaderPubSubType::createData() + void* RequestHeaderPubSubType::create_data() { return reinterpret_cast(new RequestHeader()); } - void RequestHeaderPubSubType::deleteData( + void RequestHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool RequestHeaderPubSubType::getKey( + bool RequestHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -967,35 +815,27 @@ namespace rpc { const RequestHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_rpc_RequestHeader_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 || eprosima_fastdds_dds_rpc_RequestHeader_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1009,26 +849,21 @@ namespace rpc { ReplyHeaderPubSubType::ReplyHeaderPubSubType() { - setName("eprosima::fastdds::dds::rpc::ReplyHeader"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(ReplyHeader::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_dds_rpc_ReplyHeader_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::dds::rpc::ReplyHeader"); + uint32_t type_size = eprosima_fastdds_dds_rpc_ReplyHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_rpc_ReplyHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_rpc_ReplyHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_rpc_ReplyHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_rpc_ReplyHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ReplyHeaderPubSubType::~ReplyHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1046,12 +881,10 @@ namespace rpc { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1066,11 +899,7 @@ namespace rpc { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1087,11 +916,7 @@ namespace rpc { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1108,52 +933,43 @@ namespace rpc { return true; } - std::function ReplyHeaderPubSubType::getSerializedSizeProvider( + uint32_t ReplyHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ReplyHeaderPubSubType::createData() + void* ReplyHeaderPubSubType::create_data() { return reinterpret_cast(new ReplyHeader()); } - void ReplyHeaderPubSubType::deleteData( + void ReplyHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ReplyHeaderPubSubType::getKey( + bool ReplyHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1161,35 +977,27 @@ namespace rpc { const ReplyHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_rpc_ReplyHeader_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 || eprosima_fastdds_dds_rpc_ReplyHeader_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index ed5dc81faea..d5108db1235 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -102,18 +102,18 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -154,8 +154,8 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -231,18 +231,18 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -283,8 +283,8 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -360,18 +360,18 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -412,8 +412,8 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -489,18 +489,18 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -541,8 +541,8 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -592,18 +592,18 @@ namespace rpc eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -638,8 +638,8 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -699,18 +699,18 @@ namespace rpc eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -751,8 +751,8 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index c5330fd4273..ef521541347 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -164,7 +164,7 @@ DataWriterImpl::DataWriterImpl( { EndpointAttributes endpoint_attributes; endpoint_attributes.endpointKind = WRITER; - endpoint_attributes.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + endpoint_attributes.topicKind = type_->is_compute_key_provided ? WITH_KEY : NO_KEY; endpoint_attributes.setEntityID(qos_.endpoint().entity_id); endpoint_attributes.setUserDefinedID(qos_.endpoint().user_defined_id); fastdds::rtps::RTPSParticipantImpl::preprocess_endpoint_attributes( @@ -228,7 +228,7 @@ void DataWriterImpl::create_history( history_.reset(new DataWriterHistory( payload_pool, change_pool, get_topic_attributes(qos_, *topic_, type_), - type_->m_typeSize, + type_->max_serialized_type_size, qos_.endpoint().history_memory_policy, [this]( const InstanceHandle_t& handle) -> void @@ -246,7 +246,7 @@ ReturnCode_t DataWriterImpl::enable() auto topic_att = get_topic_attributes(qos_, *topic_, type_); auto history_att = DataWriterHistory::to_history_attributes( - topic_att, type_->m_typeSize, qos_.endpoint().history_memory_policy); + topic_att, type_->max_serialized_type_size, qos_.endpoint().history_memory_policy); pool_config_ = PoolConfig::from_history_attributes(history_att); // When the user requested PREALLOCATED_WITH_REALLOC, but we know the type cannot @@ -261,7 +261,7 @@ ReturnCode_t DataWriterImpl::enable() w_att.endpoint.durabilityKind = qos_.durability().durabilityKind(); w_att.endpoint.endpointKind = WRITER; w_att.endpoint.reliabilityKind = qos_.reliability().kind == RELIABLE_RELIABILITY_QOS ? RELIABLE : BEST_EFFORT; - w_att.endpoint.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + w_att.endpoint.topicKind = type_->is_compute_key_provided ? WITH_KEY : NO_KEY; w_att.endpoint.multicastLocatorList = qos_.endpoint().multicast_locator_list; w_att.endpoint.unicastLocatorList = qos_.endpoint().unicast_locator_list; w_att.endpoint.remoteLocatorList = qos_.endpoint().remote_locator_list; @@ -500,7 +500,7 @@ DataWriterImpl::~DataWriterImpl() if (writer_ != nullptr) { - EPROSIMA_LOG_INFO(DATA_WRITER, guid().entityId << " in topic: " << type_->getName()); + EPROSIMA_LOG_INFO(DATA_WRITER, guid().entityId << " in topic: " << type_->get_name()); RTPSDomain::removeRTPSWriter(writer_); release_payload_pool(); } @@ -517,7 +517,8 @@ ReturnCode_t DataWriterImpl::loan_sample( microseconds(rtps::TimeConv::Time_t2MicroSecondsInt64(qos_.reliability().max_blocking_time)); // Type should be plain and have space for the representation header - if (!type_->is_plain(data_representation_) || SerializedPayload_t::representation_header_size > type_->m_typeSize) + if (!type_->is_plain(data_representation_) || + SerializedPayload_t::representation_header_size > type_->max_serialized_type_size) { return RETCODE_ILLEGAL_OPERATION; } @@ -541,11 +542,8 @@ ReturnCode_t DataWriterImpl::loan_sample( // Get one payload from the pool SerializedPayload_t payload; - uint32_t size = type_->m_typeSize; - if (!get_free_payload_from_pool([size]() - { - return size; - }, payload)) + uint32_t size = type_->max_serialized_type_size; + if (!get_free_payload_from_pool(size, payload)) { return RETCODE_OUT_OF_RESOURCES; } @@ -607,7 +605,8 @@ ReturnCode_t DataWriterImpl::discard_loan( void*& sample) { // Type should be plain and have space for the representation header - if (!type_->is_plain(data_representation_) || SerializedPayload_t::representation_header_size > type_->m_typeSize) + if (!type_->is_plain(data_representation_) || + SerializedPayload_t::representation_header_size > type_->max_serialized_type_size) { return RETCODE_ILLEGAL_OPERATION; } @@ -669,13 +668,13 @@ ReturnCode_t DataWriterImpl::check_write_preconditions( return RETCODE_NOT_ENABLED; } - if (type_.get()->m_isGetKeyDefined) + if (type_.get()->is_compute_key_provided) { bool is_key_protected = false; #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_.get()->getKey(data, &instance_handle, is_key_protected); + type_.get()->compute_key(data, &instance_handle, is_key_protected); } //Check if the Handle is different from the special value HANDLE_NIL and @@ -748,7 +747,7 @@ ReturnCode_t DataWriterImpl::check_instance_preconditions( return RETCODE_BAD_PARAMETER; } - if (!type_->m_isGetKeyDefined) + if (!type_->is_compute_key_provided) { EPROSIMA_LOG_ERROR(DATA_WRITER, "Topic is NO_KEY, operation not permitted"); return RETCODE_PRECONDITION_NOT_MET; @@ -764,7 +763,7 @@ ReturnCode_t DataWriterImpl::check_instance_preconditions( #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_->getKey(data, &instance_handle, is_key_protected); + type_->compute_key(data, &instance_handle, is_key_protected); } #if !defined(NDEBUG) @@ -836,8 +835,8 @@ InstanceHandle_t DataWriterImpl::do_register_instance( assert(nullptr != payload); if (0 == payload->length || nullptr == payload->data) { - uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : type_->getSerializedSizeProvider(key, - data_representation_)(); + uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : type_->calculate_serialized_size(key, + data_representation_); payload->reserve(size); if (!type_->serialize(key, payload, data_representation_)) { @@ -925,7 +924,7 @@ ReturnCode_t DataWriterImpl::get_key_value( return RETCODE_BAD_PARAMETER; } - if (!type_->m_isGetKeyDefined) + if (!type_->is_compute_key_provided) { EPROSIMA_LOG_ERROR(DATA_WRITER, "Topic is NO_KEY, operation not permitted"); return RETCODE_ILLEGAL_OPERATION; @@ -982,7 +981,7 @@ ReturnCode_t DataWriterImpl::check_new_change_preconditions( || change_kind == NOT_ALIVE_DISPOSED || change_kind == NOT_ALIVE_DISPOSED_UNREGISTERED) { - if (!type_->m_isGetKeyDefined) + if (!type_->is_compute_key_provided) { EPROSIMA_LOG_ERROR(DATA_WRITER, "Topic is NO_KEY, operation not permitted"); return RETCODE_ILLEGAL_OPERATION; @@ -1016,7 +1015,8 @@ ReturnCode_t DataWriterImpl::perform_create_new_change( bool was_loaned = check_and_remove_loan(data, payload); if (!was_loaned) { - if (!get_free_payload_from_pool(type_->getSerializedSizeProvider(data, data_representation_), payload)) + if (!get_free_payload_from_pool(fixed_payload_size_ ? fixed_payload_size_ : type_->calculate_serialized_size( + data, data_representation_), payload)) { return RETCODE_OUT_OF_RESOURCES; } @@ -1108,13 +1108,13 @@ ReturnCode_t DataWriterImpl::create_new_change_with_params( } InstanceHandle_t handle; - if (type_->m_isGetKeyDefined) + if (type_->is_compute_key_provided) { bool is_key_protected = false; #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_->getKey(data, &handle, is_key_protected); + type_->compute_key(data, &handle, is_key_protected); } return perform_create_new_change(changeKind, data, wparams, handle); @@ -1329,7 +1329,7 @@ void DataWriterImpl::InnerDataWriterListener::on_writer_change_received_by_all( RTPSWriter* /*writer*/, CacheChange_t* ch) { - if (data_writer_->type_->m_isGetKeyDefined && + if (data_writer_->type_->is_compute_key_provided && (NOT_ALIVE_UNREGISTERED == ch->kind || NOT_ALIVE_DISPOSED_UNREGISTERED == ch->kind)) { @@ -1685,7 +1685,7 @@ fastdds::TopicAttributes DataWriterImpl::get_topic_attributes( topic_att.resourceLimitsQos = qos.resource_limits(); topic_att.topicName = topic.get_name(); topic_att.topicDataType = topic.get_type_name(); - topic_att.topicKind = type->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + topic_att.topicKind = type->is_compute_key_provided ? WITH_KEY : NO_KEY; if (type->auto_fill_type_information() && xtypes::TK_NONE != type->type_identifiers().type_identifier1()._d()) { if (RETCODE_OK == @@ -1863,7 +1863,7 @@ ReturnCode_t DataWriterImpl::check_qos_including_resource_limits( { ReturnCode_t check_qos_return = check_qos(qos); if (RETCODE_OK == check_qos_return && - type->m_isGetKeyDefined) + type->is_compute_key_provided) { check_qos_return = check_allocation_consistency(qos); } @@ -2147,7 +2147,7 @@ ReturnCode_t DataWriterImpl::check_datasharing_compatible( qos_.endpoint().history_memory_policy == eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE) && type_.is_bounded(); - bool has_key = type_->m_isGetKeyDefined; + bool has_key = type_->is_compute_key_provided; is_datasharing_compatible = false; switch (qos_.data_sharing().kind()) diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp index 7381286a291..56dc15b25e6 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.hpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.hpp @@ -662,9 +662,8 @@ class DataWriterImpl : protected rtps::IReaderDataFilter const fastdds::rtps::WriterAttributes& writer_attributes, bool& is_datasharing_compatible) const; - template bool get_free_payload_from_pool( - const SizeFunctor& size_getter, + uint32_t size, SerializedPayload_t& payload) { if (!payload_pool_) @@ -672,7 +671,6 @@ class DataWriterImpl : protected rtps::IReaderDataFilter return false; } - uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : size_getter(); if (!payload_pool_->get_payload(size, payload)) { return false; diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp index 4d0e5020aa6..f459a002be5 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp @@ -113,7 +113,7 @@ DataReaderImpl::DataReaderImpl( { EndpointAttributes endpoint_attributes; endpoint_attributes.endpointKind = READER; - endpoint_attributes.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + endpoint_attributes.topicKind = type_->is_compute_key_provided ? WITH_KEY : NO_KEY; endpoint_attributes.setEntityID(qos_.endpoint().entity_id); endpoint_attributes.setUserDefinedID(qos_.endpoint().user_defined_id); RTPSParticipantImpl::preprocess_endpoint_attributes( @@ -166,7 +166,7 @@ ReturnCode_t DataReaderImpl::enable() att.endpoint.durabilityKind = qos_.durability().durabilityKind(); att.endpoint.endpointKind = READER; att.endpoint.reliabilityKind = qos_.reliability().kind == RELIABLE_RELIABILITY_QOS ? RELIABLE : BEST_EFFORT; - att.endpoint.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + att.endpoint.topicKind = type_->is_compute_key_provided ? WITH_KEY : NO_KEY; att.endpoint.multicastLocatorList = qos_.endpoint().multicast_locator_list; att.endpoint.unicastLocatorList = qos_.endpoint().unicast_locator_list; att.endpoint.remoteLocatorList = qos_.endpoint().remote_locator_list; @@ -1489,7 +1489,7 @@ ReturnCode_t DataReaderImpl::check_qos_including_resource_limits( { ReturnCode_t check_qos_return = check_qos(qos); if (RETCODE_OK == check_qos_return && - type->m_isGetKeyDefined) + type->is_compute_key_provided) { check_qos_return = check_allocation_consistency(qos); } @@ -1773,7 +1773,7 @@ void DataReaderImpl::set_qos( fastdds::TopicAttributes DataReaderImpl::topic_attributes() const { fastdds::TopicAttributes topic_att; - topic_att.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; + topic_att.topicKind = type_->is_compute_key_provided ? WITH_KEY : NO_KEY; topic_att.topicName = topic_->get_impl()->get_rtps_topic_name(); topic_att.topicDataType = topic_->get_type_name(); topic_att.historyQos = qos_.history(); @@ -1874,7 +1874,7 @@ ReturnCode_t DataReaderImpl::check_datasharing_compatible( (void) reader_attributes; #endif // HAVE_SECURITY - bool has_key = type_->m_isGetKeyDefined; + bool has_key = type_->is_compute_key_provided; is_datasharing_compatible = false; switch (qos_.data_sharing().kind()) @@ -1985,9 +1985,9 @@ InstanceHandle_t DataReaderImpl::lookup_instance( { InstanceHandle_t handle = HANDLE_NIL; - if (instance && type_->m_isGetKeyDefined) + if (instance && type_->is_compute_key_provided) { - if (type_->getKey(const_cast(instance), &handle, false)) + if (type_->compute_key(const_cast(instance), &handle, false)) { if (!history_.is_instance_present(handle)) { diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp index c77200b0db4..f692ea9eeb2 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp @@ -64,7 +64,7 @@ struct SampleLoanManager OutstandingLoanItem item; if (!is_plain_) { - item.sample = type_->createData(); + item.sample = type_->create_data(); } free_loans_.push_back(std::move(item)); } @@ -76,7 +76,7 @@ struct SampleLoanManager { for (const OutstandingLoanItem& item : free_loans_) { - type_->deleteData(item.sample); + type_->delete_data(item.sample); } } } @@ -110,7 +110,7 @@ struct SampleLoanManager // Create sample if necessary if (!is_plain_) { - item->sample = type_->createData(); + item->sample = type_->create_data(); } } } diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp index c28801583ad..7f558a39f2f 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp @@ -52,7 +52,7 @@ static HistoryAttributes to_history_attributes( auto max_samples = qos.resource_limits().max_samples; auto mempolicy = qos.endpoint().history_memory_policy; - auto payloadMaxSize = type->m_typeSize + 3; // possible alignment + auto payloadMaxSize = type->max_serialized_type_size + 3; // possible alignment return HistoryAttributes(mempolicy, payloadMaxSize, initial_samples, max_samples); } @@ -67,7 +67,7 @@ DataReaderHistory::DataReaderHistory( , resource_limited_qos_(qos.resource_limits()) , topic_name_(topic.get_name()) , type_name_(topic.get_type_name()) - , has_keys_(type->m_isGetKeyDefined) + , has_keys_(type->is_compute_key_provided) , type_(type.get()) , get_key_object_(nullptr) { @@ -86,9 +86,9 @@ DataReaderHistory::DataReaderHistory( resource_limited_qos_.max_samples_per_instance = std::numeric_limits::max(); } - if (type_->m_isGetKeyDefined) + if (type_->is_compute_key_provided) { - get_key_object_ = type_->createData(); + get_key_object_ = type_->create_data(); if (resource_limited_qos_.max_samples_per_instance < std::numeric_limits::max()) { @@ -151,7 +151,7 @@ DataReaderHistory::DataReaderHistory( #if HAVE_SECURITY is_key_protected = mp_reader->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - return type_->getKey(get_key_object_, &a_change->instanceHandle, is_key_protected); + return type_->compute_key(get_key_object_, &a_change->instanceHandle, is_key_protected); } EPROSIMA_LOG_WARNING(SUBSCRIBER, "NO KEY in topic: " << topic_name_ @@ -163,9 +163,9 @@ DataReaderHistory::DataReaderHistory( DataReaderHistory::~DataReaderHistory() { - if (type_->m_isGetKeyDefined) + if (type_->is_compute_key_provided) { - type_->deleteData(get_key_object_); + type_->delete_data(get_key_object_); } } diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp index 05102defca0..6058a4f98b0 100644 --- a/src/cpp/fastdds/topic/TopicDataType.cpp +++ b/src/cpp/fastdds/topic/TopicDataType.cpp @@ -31,13 +31,6 @@ namespace eprosima { namespace fastdds { namespace dds { -TopicDataType::TopicDataType() - : m_typeSize(0) - , m_isGetKeyDefined(false) - , auto_fill_type_information_(true) -{ -} - TopicDataType::~TopicDataType() { } diff --git a/src/cpp/fastdds/topic/TopicImpl.cpp b/src/cpp/fastdds/topic/TopicImpl.cpp index 0ffc3293c57..43bd741960e 100644 --- a/src/cpp/fastdds/topic/TopicImpl.cpp +++ b/src/cpp/fastdds/topic/TopicImpl.cpp @@ -56,7 +56,7 @@ ReturnCode_t TopicImpl::check_qos_including_resource_limits( { ReturnCode_t check_qos_return = check_qos(qos); if (RETCODE_OK == check_qos_return && - type->m_isGetKeyDefined) + type->is_compute_key_provided) { check_qos_return = check_allocation_consistency(qos); } diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp index 66291c31d92..d589159b583 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp @@ -49,7 +49,7 @@ DynamicPubSubType::~DynamicPubSubType() } } -void* DynamicPubSubType::createData() +void* DynamicPubSubType::create_data() { if (!dynamic_type_) { @@ -66,7 +66,7 @@ void* DynamicPubSubType::createData() } } -void DynamicPubSubType::deleteData( +void DynamicPubSubType::delete_data( void* data) { traits::ref_type* data_ptr = static_cast::ref_type*>(data); @@ -102,12 +102,12 @@ traits::ref_type DynamicPubSubType::get_dynamic_type() const noexce return dynamic_type_; } -bool DynamicPubSubType::getKey( +bool DynamicPubSubType::compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* handle, bool force_md5) { - if (!dynamic_type_ || !m_isGetKeyDefined) + if (!dynamic_type_ || !is_compute_key_provided) { return false; } @@ -148,29 +148,26 @@ bool DynamicPubSubType::getKey( return true; } -std::function DynamicPubSubType::getSerializedSizeProvider( +uint32_t DynamicPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { const traits::ref_type* data_ptr = static_cast::ref_type*>(data); - return [data_ptr, data_representation]() -> uint32_t - { - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *data_ptr, current_alignment)) + 4u /*encapsulation*/; - - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *data_ptr, current_alignment)) + 4u /*encapsulation*/; + + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } bool DynamicPubSubType::serialize( @@ -249,15 +246,15 @@ void DynamicPubSubType::register_type_object_representation() void DynamicPubSubType::update_dynamic_type() { - m_isGetKeyDefined = false; + is_compute_key_provided = false; if (nullptr == dynamic_type_) { return; } - m_typeSize = static_cast(DynamicDataImpl::calculate_max_serialized_size(dynamic_type_) + 4); - setName(dynamic_type_->get_name()); + max_serialized_type_size = static_cast(DynamicDataImpl::calculate_max_serialized_size(dynamic_type_) + 4); + set_name(dynamic_type_->get_name()); if (TK_STRUCTURE == dynamic_type_->get_kind()) { @@ -267,7 +264,7 @@ void DynamicPubSubType::update_dynamic_type() auto member_impl = traits::narrow(member); if (member_impl->get_descriptor().is_key()) { - m_isGetKeyDefined = true; + is_compute_key_provided = true; break; } } diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx index 5fd99342f29..f4c8993c1e9 100644 --- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx +++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx @@ -41,26 +41,21 @@ namespace xtypes { StringSTypeDefnPubSubType::StringSTypeDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::StringSTypeDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StringSTypeDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::StringSTypeDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StringSTypeDefnPubSubType::~StringSTypeDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -78,12 +73,10 @@ bool StringSTypeDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -98,11 +91,7 @@ bool StringSTypeDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -119,11 +108,7 @@ bool StringSTypeDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -140,52 +125,43 @@ bool StringSTypeDefnPubSubType::deserialize( return true; } -std::function StringSTypeDefnPubSubType::getSerializedSizeProvider( +uint32_t StringSTypeDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StringSTypeDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StringSTypeDefnPubSubType::create_data() { return reinterpret_cast(new StringSTypeDefn()); } -void StringSTypeDefnPubSubType::deleteData( +void StringSTypeDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StringSTypeDefnPubSubType::getKey( +bool StringSTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -193,35 +169,27 @@ bool StringSTypeDefnPubSubType::getKey( const StringSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_StringSTypeDefn_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 || eprosima_fastdds_dds_xtypes_StringSTypeDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -235,26 +203,21 @@ void StringSTypeDefnPubSubType::register_type_object_representation() StringLTypeDefnPubSubType::StringLTypeDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::StringLTypeDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StringLTypeDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::StringLTypeDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StringLTypeDefnPubSubType::~StringLTypeDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -272,12 +235,10 @@ bool StringLTypeDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -292,11 +253,7 @@ bool StringLTypeDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -313,11 +270,7 @@ bool StringLTypeDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -334,52 +287,43 @@ bool StringLTypeDefnPubSubType::deserialize( return true; } -std::function StringLTypeDefnPubSubType::getSerializedSizeProvider( +uint32_t StringLTypeDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StringLTypeDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StringLTypeDefnPubSubType::create_data() { return reinterpret_cast(new StringLTypeDefn()); } -void StringLTypeDefnPubSubType::deleteData( +void StringLTypeDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StringLTypeDefnPubSubType::getKey( +bool StringLTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -387,35 +331,27 @@ bool StringLTypeDefnPubSubType::getKey( const StringLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_StringLTypeDefn_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 || eprosima_fastdds_dds_xtypes_StringLTypeDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -429,26 +365,21 @@ void StringLTypeDefnPubSubType::register_type_object_representation() PlainCollectionHeaderPubSubType::PlainCollectionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainCollectionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainCollectionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainCollectionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainCollectionHeaderPubSubType::~PlainCollectionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -466,12 +397,10 @@ bool PlainCollectionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -486,11 +415,7 @@ bool PlainCollectionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -507,11 +432,7 @@ bool PlainCollectionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -528,52 +449,43 @@ bool PlainCollectionHeaderPubSubType::deserialize( return true; } -std::function PlainCollectionHeaderPubSubType::getSerializedSizeProvider( +uint32_t PlainCollectionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainCollectionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainCollectionHeaderPubSubType::create_data() { return reinterpret_cast(new PlainCollectionHeader()); } -void PlainCollectionHeaderPubSubType::deleteData( +void PlainCollectionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainCollectionHeaderPubSubType::getKey( +bool PlainCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -581,35 +493,27 @@ bool PlainCollectionHeaderPubSubType::getKey( const PlainCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainCollectionHeader_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 || eprosima_fastdds_dds_xtypes_PlainCollectionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -623,26 +527,21 @@ void PlainCollectionHeaderPubSubType::register_type_object_representation() PlainSequenceSElemDefnPubSubType::PlainSequenceSElemDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainSequenceSElemDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainSequenceSElemDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainSequenceSElemDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainSequenceSElemDefnPubSubType::~PlainSequenceSElemDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -660,12 +559,10 @@ bool PlainSequenceSElemDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -680,11 +577,7 @@ bool PlainSequenceSElemDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -701,11 +594,7 @@ bool PlainSequenceSElemDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -722,52 +611,43 @@ bool PlainSequenceSElemDefnPubSubType::deserialize( return true; } -std::function PlainSequenceSElemDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainSequenceSElemDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainSequenceSElemDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainSequenceSElemDefnPubSubType::create_data() { return reinterpret_cast(new PlainSequenceSElemDefn()); } -void PlainSequenceSElemDefnPubSubType::deleteData( +void PlainSequenceSElemDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainSequenceSElemDefnPubSubType::getKey( +bool PlainSequenceSElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -775,35 +655,27 @@ bool PlainSequenceSElemDefnPubSubType::getKey( const PlainSequenceSElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_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 || eprosima_fastdds_dds_xtypes_PlainSequenceSElemDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -817,26 +689,21 @@ void PlainSequenceSElemDefnPubSubType::register_type_object_representation() PlainSequenceLElemDefnPubSubType::PlainSequenceLElemDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainSequenceLElemDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainSequenceLElemDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainSequenceLElemDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainSequenceLElemDefnPubSubType::~PlainSequenceLElemDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -854,12 +721,10 @@ bool PlainSequenceLElemDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -874,11 +739,7 @@ bool PlainSequenceLElemDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -895,11 +756,7 @@ bool PlainSequenceLElemDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -916,52 +773,43 @@ bool PlainSequenceLElemDefnPubSubType::deserialize( return true; } -std::function PlainSequenceLElemDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainSequenceLElemDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainSequenceLElemDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainSequenceLElemDefnPubSubType::create_data() { return reinterpret_cast(new PlainSequenceLElemDefn()); } -void PlainSequenceLElemDefnPubSubType::deleteData( +void PlainSequenceLElemDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainSequenceLElemDefnPubSubType::getKey( +bool PlainSequenceLElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -969,35 +817,27 @@ bool PlainSequenceLElemDefnPubSubType::getKey( const PlainSequenceLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_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 || eprosima_fastdds_dds_xtypes_PlainSequenceLElemDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1011,26 +851,21 @@ void PlainSequenceLElemDefnPubSubType::register_type_object_representation() PlainArraySElemDefnPubSubType::PlainArraySElemDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainArraySElemDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainArraySElemDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainArraySElemDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainArraySElemDefnPubSubType::~PlainArraySElemDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1048,12 +883,10 @@ bool PlainArraySElemDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1068,11 +901,7 @@ bool PlainArraySElemDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1089,11 +918,7 @@ bool PlainArraySElemDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1110,52 +935,43 @@ bool PlainArraySElemDefnPubSubType::deserialize( return true; } -std::function PlainArraySElemDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainArraySElemDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainArraySElemDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainArraySElemDefnPubSubType::create_data() { return reinterpret_cast(new PlainArraySElemDefn()); } -void PlainArraySElemDefnPubSubType::deleteData( +void PlainArraySElemDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainArraySElemDefnPubSubType::getKey( +bool PlainArraySElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1163,35 +979,27 @@ bool PlainArraySElemDefnPubSubType::getKey( const PlainArraySElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_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 || eprosima_fastdds_dds_xtypes_PlainArraySElemDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1205,26 +1013,21 @@ void PlainArraySElemDefnPubSubType::register_type_object_representation() PlainArrayLElemDefnPubSubType::PlainArrayLElemDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainArrayLElemDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainArrayLElemDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainArrayLElemDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainArrayLElemDefnPubSubType::~PlainArrayLElemDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1242,12 +1045,10 @@ bool PlainArrayLElemDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1262,11 +1063,7 @@ bool PlainArrayLElemDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1283,11 +1080,7 @@ bool PlainArrayLElemDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1304,52 +1097,43 @@ bool PlainArrayLElemDefnPubSubType::deserialize( return true; } -std::function PlainArrayLElemDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainArrayLElemDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainArrayLElemDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainArrayLElemDefnPubSubType::create_data() { return reinterpret_cast(new PlainArrayLElemDefn()); } -void PlainArrayLElemDefnPubSubType::deleteData( +void PlainArrayLElemDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainArrayLElemDefnPubSubType::getKey( +bool PlainArrayLElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1357,35 +1141,27 @@ bool PlainArrayLElemDefnPubSubType::getKey( const PlainArrayLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_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 || eprosima_fastdds_dds_xtypes_PlainArrayLElemDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1399,26 +1175,21 @@ void PlainArrayLElemDefnPubSubType::register_type_object_representation() PlainMapSTypeDefnPubSubType::PlainMapSTypeDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainMapSTypeDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainMapSTypeDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainMapSTypeDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainMapSTypeDefnPubSubType::~PlainMapSTypeDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1436,12 +1207,10 @@ bool PlainMapSTypeDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1456,11 +1225,7 @@ bool PlainMapSTypeDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1477,11 +1242,7 @@ bool PlainMapSTypeDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1498,52 +1259,43 @@ bool PlainMapSTypeDefnPubSubType::deserialize( return true; } -std::function PlainMapSTypeDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainMapSTypeDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainMapSTypeDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainMapSTypeDefnPubSubType::create_data() { return reinterpret_cast(new PlainMapSTypeDefn()); } -void PlainMapSTypeDefnPubSubType::deleteData( +void PlainMapSTypeDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainMapSTypeDefnPubSubType::getKey( +bool PlainMapSTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1551,35 +1303,27 @@ bool PlainMapSTypeDefnPubSubType::getKey( const PlainMapSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_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 || eprosima_fastdds_dds_xtypes_PlainMapSTypeDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1593,26 +1337,21 @@ void PlainMapSTypeDefnPubSubType::register_type_object_representation() PlainMapLTypeDefnPubSubType::PlainMapLTypeDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::PlainMapLTypeDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PlainMapLTypeDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::PlainMapLTypeDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PlainMapLTypeDefnPubSubType::~PlainMapLTypeDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1630,12 +1369,10 @@ bool PlainMapLTypeDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1650,11 +1387,7 @@ bool PlainMapLTypeDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1671,11 +1404,7 @@ bool PlainMapLTypeDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1692,52 +1421,43 @@ bool PlainMapLTypeDefnPubSubType::deserialize( return true; } -std::function PlainMapLTypeDefnPubSubType::getSerializedSizeProvider( +uint32_t PlainMapLTypeDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* PlainMapLTypeDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* PlainMapLTypeDefnPubSubType::create_data() { return reinterpret_cast(new PlainMapLTypeDefn()); } -void PlainMapLTypeDefnPubSubType::deleteData( +void PlainMapLTypeDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PlainMapLTypeDefnPubSubType::getKey( +bool PlainMapLTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1745,35 +1465,27 @@ bool PlainMapLTypeDefnPubSubType::getKey( const PlainMapLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_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 || eprosima_fastdds_dds_xtypes_PlainMapLTypeDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1787,26 +1499,21 @@ void PlainMapLTypeDefnPubSubType::register_type_object_representation() StronglyConnectedComponentIdPubSubType::StronglyConnectedComponentIdPubSubType() { - setName("eprosima::fastdds::dds::xtypes::StronglyConnectedComponentId"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StronglyConnectedComponentId::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::StronglyConnectedComponentId"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StronglyConnectedComponentIdPubSubType::~StronglyConnectedComponentIdPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1824,12 +1531,10 @@ bool StronglyConnectedComponentIdPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1844,11 +1549,7 @@ bool StronglyConnectedComponentIdPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1865,11 +1566,7 @@ bool StronglyConnectedComponentIdPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1886,52 +1583,43 @@ bool StronglyConnectedComponentIdPubSubType::deserialize( return true; } -std::function StronglyConnectedComponentIdPubSubType::getSerializedSizeProvider( +uint32_t StronglyConnectedComponentIdPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StronglyConnectedComponentIdPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StronglyConnectedComponentIdPubSubType::create_data() { return reinterpret_cast(new StronglyConnectedComponentId()); } -void StronglyConnectedComponentIdPubSubType::deleteData( +void StronglyConnectedComponentIdPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StronglyConnectedComponentIdPubSubType::getKey( +bool StronglyConnectedComponentIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1939,35 +1627,27 @@ bool StronglyConnectedComponentIdPubSubType::getKey( const StronglyConnectedComponentId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_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 || eprosima_fastdds_dds_xtypes_StronglyConnectedComponentId_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1981,26 +1661,21 @@ void StronglyConnectedComponentIdPubSubType::register_type_object_representation ExtendedTypeDefnPubSubType::ExtendedTypeDefnPubSubType() { - setName("eprosima::fastdds::dds::xtypes::ExtendedTypeDefn"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ExtendedTypeDefn::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::ExtendedTypeDefn"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ExtendedTypeDefnPubSubType::~ExtendedTypeDefnPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2018,12 +1693,10 @@ bool ExtendedTypeDefnPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2038,11 +1711,7 @@ bool ExtendedTypeDefnPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2059,11 +1728,7 @@ bool ExtendedTypeDefnPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2080,52 +1745,43 @@ bool ExtendedTypeDefnPubSubType::deserialize( return true; } -std::function ExtendedTypeDefnPubSubType::getSerializedSizeProvider( +uint32_t ExtendedTypeDefnPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ExtendedTypeDefnPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ExtendedTypeDefnPubSubType::create_data() { return reinterpret_cast(new ExtendedTypeDefn()); } -void ExtendedTypeDefnPubSubType::deleteData( +void ExtendedTypeDefnPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ExtendedTypeDefnPubSubType::getKey( +bool ExtendedTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2133,35 +1789,27 @@ bool ExtendedTypeDefnPubSubType::getKey( const ExtendedTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_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 || eprosima_fastdds_dds_xtypes_ExtendedTypeDefn_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2175,26 +1823,21 @@ void ExtendedTypeDefnPubSubType::register_type_object_representation() DummyPubSubType::DummyPubSubType() { - setName("eprosima::fastdds::dds::xtypes::Dummy"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Dummy::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_Dummy_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::Dummy"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_Dummy_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_Dummy_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_Dummy_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_Dummy_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_Dummy_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DummyPubSubType::~DummyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2212,12 +1855,10 @@ bool DummyPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2232,11 +1873,7 @@ bool DummyPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2253,11 +1890,7 @@ bool DummyPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2274,52 +1907,43 @@ bool DummyPubSubType::deserialize( return true; } -std::function DummyPubSubType::getSerializedSizeProvider( +uint32_t DummyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DummyPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DummyPubSubType::create_data() { return reinterpret_cast(new Dummy()); } -void DummyPubSubType::deleteData( +void DummyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DummyPubSubType::getKey( +bool DummyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2327,35 +1951,27 @@ bool DummyPubSubType::getKey( const Dummy* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_Dummy_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 || eprosima_fastdds_dds_xtypes_Dummy_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2374,26 +1990,21 @@ void DummyPubSubType::register_type_object_representation() ExtendedAnnotationParameterValuePubSubType::ExtendedAnnotationParameterValuePubSubType() { - setName("eprosima::fastdds::dds::xtypes::ExtendedAnnotationParameterValue"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ExtendedAnnotationParameterValue::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::ExtendedAnnotationParameterValue"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ExtendedAnnotationParameterValuePubSubType::~ExtendedAnnotationParameterValuePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2411,12 +2022,10 @@ bool ExtendedAnnotationParameterValuePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2431,11 +2040,7 @@ bool ExtendedAnnotationParameterValuePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2452,11 +2057,7 @@ bool ExtendedAnnotationParameterValuePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2473,52 +2074,43 @@ bool ExtendedAnnotationParameterValuePubSubType::deserialize( return true; } -std::function ExtendedAnnotationParameterValuePubSubType::getSerializedSizeProvider( +uint32_t ExtendedAnnotationParameterValuePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ExtendedAnnotationParameterValuePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ExtendedAnnotationParameterValuePubSubType::create_data() { return reinterpret_cast(new ExtendedAnnotationParameterValue()); } -void ExtendedAnnotationParameterValuePubSubType::deleteData( +void ExtendedAnnotationParameterValuePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ExtendedAnnotationParameterValuePubSubType::getKey( +bool ExtendedAnnotationParameterValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2526,35 +2118,27 @@ bool ExtendedAnnotationParameterValuePubSubType::getKey( const ExtendedAnnotationParameterValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_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 || eprosima_fastdds_dds_xtypes_ExtendedAnnotationParameterValue_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2569,26 +2153,21 @@ void ExtendedAnnotationParameterValuePubSubType::register_type_object_representa AppliedAnnotationParameterPubSubType::AppliedAnnotationParameterPubSubType() { - setName("eprosima::fastdds::dds::xtypes::AppliedAnnotationParameter"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppliedAnnotationParameter::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::AppliedAnnotationParameter"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppliedAnnotationParameterPubSubType::~AppliedAnnotationParameterPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2606,12 +2185,10 @@ bool AppliedAnnotationParameterPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2626,11 +2203,7 @@ bool AppliedAnnotationParameterPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2647,11 +2220,7 @@ bool AppliedAnnotationParameterPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2668,52 +2237,43 @@ bool AppliedAnnotationParameterPubSubType::deserialize( return true; } -std::function AppliedAnnotationParameterPubSubType::getSerializedSizeProvider( +uint32_t AppliedAnnotationParameterPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppliedAnnotationParameterPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppliedAnnotationParameterPubSubType::create_data() { return reinterpret_cast(new AppliedAnnotationParameter()); } -void AppliedAnnotationParameterPubSubType::deleteData( +void AppliedAnnotationParameterPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppliedAnnotationParameterPubSubType::getKey( +bool AppliedAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2721,35 +2281,27 @@ bool AppliedAnnotationParameterPubSubType::getKey( const AppliedAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_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 || eprosima_fastdds_dds_xtypes_AppliedAnnotationParameter_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2764,26 +2316,21 @@ void AppliedAnnotationParameterPubSubType::register_type_object_representation() AppliedAnnotationPubSubType::AppliedAnnotationPubSubType() { - setName("eprosima::fastdds::dds::xtypes::AppliedAnnotation"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppliedAnnotation::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::AppliedAnnotation"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppliedAnnotationPubSubType::~AppliedAnnotationPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2801,12 +2348,10 @@ bool AppliedAnnotationPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2821,11 +2366,7 @@ bool AppliedAnnotationPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2842,11 +2383,7 @@ bool AppliedAnnotationPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2863,52 +2400,43 @@ bool AppliedAnnotationPubSubType::deserialize( return true; } -std::function AppliedAnnotationPubSubType::getSerializedSizeProvider( +uint32_t AppliedAnnotationPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppliedAnnotationPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppliedAnnotationPubSubType::create_data() { return reinterpret_cast(new AppliedAnnotation()); } -void AppliedAnnotationPubSubType::deleteData( +void AppliedAnnotationPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppliedAnnotationPubSubType::getKey( +bool AppliedAnnotationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2916,35 +2444,27 @@ bool AppliedAnnotationPubSubType::getKey( const AppliedAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_AppliedAnnotation_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 || eprosima_fastdds_dds_xtypes_AppliedAnnotation_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2959,26 +2479,21 @@ void AppliedAnnotationPubSubType::register_type_object_representation() AppliedVerbatimAnnotationPubSubType::AppliedVerbatimAnnotationPubSubType() { - setName("eprosima::fastdds::dds::xtypes::AppliedVerbatimAnnotation"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppliedVerbatimAnnotation::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::AppliedVerbatimAnnotation"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppliedVerbatimAnnotationPubSubType::~AppliedVerbatimAnnotationPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2996,12 +2511,10 @@ bool AppliedVerbatimAnnotationPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3016,11 +2529,7 @@ bool AppliedVerbatimAnnotationPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3037,11 +2546,7 @@ bool AppliedVerbatimAnnotationPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3058,52 +2563,43 @@ bool AppliedVerbatimAnnotationPubSubType::deserialize( return true; } -std::function AppliedVerbatimAnnotationPubSubType::getSerializedSizeProvider( +uint32_t AppliedVerbatimAnnotationPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppliedVerbatimAnnotationPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppliedVerbatimAnnotationPubSubType::create_data() { return reinterpret_cast(new AppliedVerbatimAnnotation()); } -void AppliedVerbatimAnnotationPubSubType::deleteData( +void AppliedVerbatimAnnotationPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppliedVerbatimAnnotationPubSubType::getKey( +bool AppliedVerbatimAnnotationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3111,35 +2607,27 @@ bool AppliedVerbatimAnnotationPubSubType::getKey( const AppliedVerbatimAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_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 || eprosima_fastdds_dds_xtypes_AppliedVerbatimAnnotation_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3153,26 +2641,21 @@ void AppliedVerbatimAnnotationPubSubType::register_type_object_representation() AppliedBuiltinMemberAnnotationsPubSubType::AppliedBuiltinMemberAnnotationsPubSubType() { - setName("eprosima::fastdds::dds::xtypes::AppliedBuiltinMemberAnnotations"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppliedBuiltinMemberAnnotations::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::AppliedBuiltinMemberAnnotations"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppliedBuiltinMemberAnnotationsPubSubType::~AppliedBuiltinMemberAnnotationsPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3190,12 +2673,10 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3210,11 +2691,7 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3231,11 +2708,7 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3252,52 +2725,43 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::deserialize( return true; } -std::function AppliedBuiltinMemberAnnotationsPubSubType::getSerializedSizeProvider( +uint32_t AppliedBuiltinMemberAnnotationsPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppliedBuiltinMemberAnnotationsPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppliedBuiltinMemberAnnotationsPubSubType::create_data() { return reinterpret_cast(new AppliedBuiltinMemberAnnotations()); } -void AppliedBuiltinMemberAnnotationsPubSubType::deleteData( +void AppliedBuiltinMemberAnnotationsPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppliedBuiltinMemberAnnotationsPubSubType::getKey( +bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3305,35 +2769,27 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::getKey( const AppliedBuiltinMemberAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_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 || eprosima_fastdds_dds_xtypes_AppliedBuiltinMemberAnnotations_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3347,26 +2803,21 @@ void AppliedBuiltinMemberAnnotationsPubSubType::register_type_object_representat CommonStructMemberPubSubType::CommonStructMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonStructMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonStructMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonStructMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonStructMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonStructMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonStructMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonStructMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonStructMemberPubSubType::~CommonStructMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3384,12 +2835,10 @@ bool CommonStructMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3404,11 +2853,7 @@ bool CommonStructMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3425,11 +2870,7 @@ bool CommonStructMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3446,52 +2887,43 @@ bool CommonStructMemberPubSubType::deserialize( return true; } -std::function CommonStructMemberPubSubType::getSerializedSizeProvider( +uint32_t CommonStructMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonStructMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonStructMemberPubSubType::create_data() { return reinterpret_cast(new CommonStructMember()); } -void CommonStructMemberPubSubType::deleteData( +void CommonStructMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonStructMemberPubSubType::getKey( +bool CommonStructMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3499,35 +2931,27 @@ bool CommonStructMemberPubSubType::getKey( const CommonStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonStructMember_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 || eprosima_fastdds_dds_xtypes_CommonStructMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3541,26 +2965,21 @@ void CommonStructMemberPubSubType::register_type_object_representation() CompleteMemberDetailPubSubType::CompleteMemberDetailPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteMemberDetail"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteMemberDetail::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteMemberDetail"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteMemberDetailPubSubType::~CompleteMemberDetailPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3578,12 +2997,10 @@ bool CompleteMemberDetailPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3598,11 +3015,7 @@ bool CompleteMemberDetailPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3619,11 +3032,7 @@ bool CompleteMemberDetailPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3640,52 +3049,43 @@ bool CompleteMemberDetailPubSubType::deserialize( return true; } -std::function CompleteMemberDetailPubSubType::getSerializedSizeProvider( +uint32_t CompleteMemberDetailPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteMemberDetailPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteMemberDetailPubSubType::create_data() { return reinterpret_cast(new CompleteMemberDetail()); } -void CompleteMemberDetailPubSubType::deleteData( +void CompleteMemberDetailPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteMemberDetailPubSubType::getKey( +bool CompleteMemberDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3693,35 +3093,27 @@ bool CompleteMemberDetailPubSubType::getKey( const CompleteMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteMemberDetail_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 || eprosima_fastdds_dds_xtypes_CompleteMemberDetail_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3735,26 +3127,21 @@ void CompleteMemberDetailPubSubType::register_type_object_representation() MinimalMemberDetailPubSubType::MinimalMemberDetailPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalMemberDetail"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalMemberDetail::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalMemberDetail"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalMemberDetailPubSubType::~MinimalMemberDetailPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3772,12 +3159,10 @@ bool MinimalMemberDetailPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3792,11 +3177,7 @@ bool MinimalMemberDetailPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3813,11 +3194,7 @@ bool MinimalMemberDetailPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3834,52 +3211,43 @@ bool MinimalMemberDetailPubSubType::deserialize( return true; } -std::function MinimalMemberDetailPubSubType::getSerializedSizeProvider( +uint32_t MinimalMemberDetailPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalMemberDetailPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalMemberDetailPubSubType::create_data() { return reinterpret_cast(new MinimalMemberDetail()); } -void MinimalMemberDetailPubSubType::deleteData( +void MinimalMemberDetailPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalMemberDetailPubSubType::getKey( +bool MinimalMemberDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3887,35 +3255,27 @@ bool MinimalMemberDetailPubSubType::getKey( const MinimalMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalMemberDetail_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 || eprosima_fastdds_dds_xtypes_MinimalMemberDetail_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3929,26 +3289,21 @@ void MinimalMemberDetailPubSubType::register_type_object_representation() CompleteStructMemberPubSubType::CompleteStructMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteStructMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteStructMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteStructMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteStructMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteStructMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteStructMemberPubSubType::~CompleteStructMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3966,12 +3321,10 @@ bool CompleteStructMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3986,11 +3339,7 @@ bool CompleteStructMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4007,11 +3356,7 @@ bool CompleteStructMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4028,52 +3373,43 @@ bool CompleteStructMemberPubSubType::deserialize( return true; } -std::function CompleteStructMemberPubSubType::getSerializedSizeProvider( +uint32_t CompleteStructMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteStructMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteStructMemberPubSubType::create_data() { return reinterpret_cast(new CompleteStructMember()); } -void CompleteStructMemberPubSubType::deleteData( +void CompleteStructMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteStructMemberPubSubType::getKey( +bool CompleteStructMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4081,35 +3417,27 @@ bool CompleteStructMemberPubSubType::getKey( const CompleteStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteStructMember_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 || eprosima_fastdds_dds_xtypes_CompleteStructMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4124,26 +3452,21 @@ void CompleteStructMemberPubSubType::register_type_object_representation() MinimalStructMemberPubSubType::MinimalStructMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalStructMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalStructMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalStructMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalStructMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalStructMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalStructMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalStructMemberPubSubType::~MinimalStructMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4161,12 +3484,10 @@ bool MinimalStructMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4181,11 +3502,7 @@ bool MinimalStructMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4202,11 +3519,7 @@ bool MinimalStructMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4223,52 +3536,43 @@ bool MinimalStructMemberPubSubType::deserialize( return true; } -std::function MinimalStructMemberPubSubType::getSerializedSizeProvider( +uint32_t MinimalStructMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalStructMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalStructMemberPubSubType::create_data() { return reinterpret_cast(new MinimalStructMember()); } -void MinimalStructMemberPubSubType::deleteData( +void MinimalStructMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalStructMemberPubSubType::getKey( +bool MinimalStructMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4276,35 +3580,27 @@ bool MinimalStructMemberPubSubType::getKey( const MinimalStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalStructMember_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 || eprosima_fastdds_dds_xtypes_MinimalStructMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4319,26 +3615,21 @@ void MinimalStructMemberPubSubType::register_type_object_representation() AppliedBuiltinTypeAnnotationsPubSubType::AppliedBuiltinTypeAnnotationsPubSubType() { - setName("eprosima::fastdds::dds::xtypes::AppliedBuiltinTypeAnnotations"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppliedBuiltinTypeAnnotations::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::AppliedBuiltinTypeAnnotations"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppliedBuiltinTypeAnnotationsPubSubType::~AppliedBuiltinTypeAnnotationsPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4356,12 +3647,10 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4376,11 +3665,7 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4397,11 +3682,7 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4418,52 +3699,43 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::deserialize( return true; } -std::function AppliedBuiltinTypeAnnotationsPubSubType::getSerializedSizeProvider( +uint32_t AppliedBuiltinTypeAnnotationsPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppliedBuiltinTypeAnnotationsPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppliedBuiltinTypeAnnotationsPubSubType::create_data() { return reinterpret_cast(new AppliedBuiltinTypeAnnotations()); } -void AppliedBuiltinTypeAnnotationsPubSubType::deleteData( +void AppliedBuiltinTypeAnnotationsPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppliedBuiltinTypeAnnotationsPubSubType::getKey( +bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4471,35 +3743,27 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::getKey( const AppliedBuiltinTypeAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_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 || eprosima_fastdds_dds_xtypes_AppliedBuiltinTypeAnnotations_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4513,26 +3777,21 @@ void AppliedBuiltinTypeAnnotationsPubSubType::register_type_object_representatio MinimalTypeDetailPubSubType::MinimalTypeDetailPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalTypeDetail"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalTypeDetail::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalTypeDetail"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalTypeDetailPubSubType::~MinimalTypeDetailPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4550,12 +3809,10 @@ bool MinimalTypeDetailPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4570,11 +3827,7 @@ bool MinimalTypeDetailPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4591,11 +3844,7 @@ bool MinimalTypeDetailPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4612,52 +3861,43 @@ bool MinimalTypeDetailPubSubType::deserialize( return true; } -std::function MinimalTypeDetailPubSubType::getSerializedSizeProvider( +uint32_t MinimalTypeDetailPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalTypeDetailPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalTypeDetailPubSubType::create_data() { return reinterpret_cast(new MinimalTypeDetail()); } -void MinimalTypeDetailPubSubType::deleteData( +void MinimalTypeDetailPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalTypeDetailPubSubType::getKey( +bool MinimalTypeDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4665,35 +3905,27 @@ bool MinimalTypeDetailPubSubType::getKey( const MinimalTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalTypeDetail_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 || eprosima_fastdds_dds_xtypes_MinimalTypeDetail_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4707,26 +3939,21 @@ void MinimalTypeDetailPubSubType::register_type_object_representation() CompleteTypeDetailPubSubType::CompleteTypeDetailPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteTypeDetail"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteTypeDetail::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteTypeDetail"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteTypeDetailPubSubType::~CompleteTypeDetailPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4744,12 +3971,10 @@ bool CompleteTypeDetailPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4764,11 +3989,7 @@ bool CompleteTypeDetailPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4785,11 +4006,7 @@ bool CompleteTypeDetailPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4806,52 +4023,43 @@ bool CompleteTypeDetailPubSubType::deserialize( return true; } -std::function CompleteTypeDetailPubSubType::getSerializedSizeProvider( +uint32_t CompleteTypeDetailPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteTypeDetailPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteTypeDetailPubSubType::create_data() { return reinterpret_cast(new CompleteTypeDetail()); } -void CompleteTypeDetailPubSubType::deleteData( +void CompleteTypeDetailPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteTypeDetailPubSubType::getKey( +bool CompleteTypeDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4859,35 +4067,27 @@ bool CompleteTypeDetailPubSubType::getKey( const CompleteTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteTypeDetail_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 || eprosima_fastdds_dds_xtypes_CompleteTypeDetail_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4901,26 +4101,21 @@ void CompleteTypeDetailPubSubType::register_type_object_representation() CompleteStructHeaderPubSubType::CompleteStructHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteStructHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteStructHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteStructHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteStructHeaderPubSubType::~CompleteStructHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4938,12 +4133,10 @@ bool CompleteStructHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4958,11 +4151,7 @@ bool CompleteStructHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4979,11 +4168,7 @@ bool CompleteStructHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5000,52 +4185,43 @@ bool CompleteStructHeaderPubSubType::deserialize( return true; } -std::function CompleteStructHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteStructHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteStructHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteStructHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteStructHeader()); } -void CompleteStructHeaderPubSubType::deleteData( +void CompleteStructHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteStructHeaderPubSubType::getKey( +bool CompleteStructHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5053,35 +4229,27 @@ bool CompleteStructHeaderPubSubType::getKey( const CompleteStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteStructHeader_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 || eprosima_fastdds_dds_xtypes_CompleteStructHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5095,26 +4263,21 @@ void CompleteStructHeaderPubSubType::register_type_object_representation() MinimalStructHeaderPubSubType::MinimalStructHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalStructHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalStructHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalStructHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalStructHeaderPubSubType::~MinimalStructHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5132,12 +4295,10 @@ bool MinimalStructHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5152,11 +4313,7 @@ bool MinimalStructHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5173,11 +4330,7 @@ bool MinimalStructHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5194,52 +4347,43 @@ bool MinimalStructHeaderPubSubType::deserialize( return true; } -std::function MinimalStructHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalStructHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalStructHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalStructHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalStructHeader()); } -void MinimalStructHeaderPubSubType::deleteData( +void MinimalStructHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalStructHeaderPubSubType::getKey( +bool MinimalStructHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5247,35 +4391,27 @@ bool MinimalStructHeaderPubSubType::getKey( const MinimalStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalStructHeader_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 || eprosima_fastdds_dds_xtypes_MinimalStructHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5289,26 +4425,21 @@ void MinimalStructHeaderPubSubType::register_type_object_representation() CompleteStructTypePubSubType::CompleteStructTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteStructType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteStructType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteStructType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteStructType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteStructType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteStructType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteStructType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteStructType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteStructTypePubSubType::~CompleteStructTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5326,12 +4457,10 @@ bool CompleteStructTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5346,11 +4475,7 @@ bool CompleteStructTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5367,11 +4492,7 @@ bool CompleteStructTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5388,52 +4509,43 @@ bool CompleteStructTypePubSubType::deserialize( return true; } -std::function CompleteStructTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteStructTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteStructTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteStructTypePubSubType::create_data() { return reinterpret_cast(new CompleteStructType()); } -void CompleteStructTypePubSubType::deleteData( +void CompleteStructTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteStructTypePubSubType::getKey( +bool CompleteStructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5441,35 +4553,27 @@ bool CompleteStructTypePubSubType::getKey( const CompleteStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteStructType_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 || eprosima_fastdds_dds_xtypes_CompleteStructType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5483,26 +4587,21 @@ void CompleteStructTypePubSubType::register_type_object_representation() MinimalStructTypePubSubType::MinimalStructTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalStructType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalStructType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalStructType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalStructType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalStructType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalStructType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalStructType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalStructType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalStructTypePubSubType::~MinimalStructTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5520,12 +4619,10 @@ bool MinimalStructTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5540,11 +4637,7 @@ bool MinimalStructTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5561,11 +4654,7 @@ bool MinimalStructTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5582,52 +4671,43 @@ bool MinimalStructTypePubSubType::deserialize( return true; } -std::function MinimalStructTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalStructTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalStructTypePubSubType::createData() -{ - return reinterpret_cast(new MinimalStructType()); -} - -void MinimalStructTypePubSubType::deleteData( + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalStructTypePubSubType::create_data() +{ + return reinterpret_cast(new MinimalStructType()); +} + +void MinimalStructTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalStructTypePubSubType::getKey( +bool MinimalStructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5635,35 +4715,27 @@ bool MinimalStructTypePubSubType::getKey( const MinimalStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalStructType_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 || eprosima_fastdds_dds_xtypes_MinimalStructType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5678,26 +4750,21 @@ void MinimalStructTypePubSubType::register_type_object_representation() CommonUnionMemberPubSubType::CommonUnionMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonUnionMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonUnionMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonUnionMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonUnionMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonUnionMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonUnionMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonUnionMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonUnionMemberPubSubType::~CommonUnionMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5715,12 +4782,10 @@ bool CommonUnionMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5735,11 +4800,7 @@ bool CommonUnionMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5756,11 +4817,7 @@ bool CommonUnionMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5777,52 +4834,43 @@ bool CommonUnionMemberPubSubType::deserialize( return true; } -std::function CommonUnionMemberPubSubType::getSerializedSizeProvider( +uint32_t CommonUnionMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonUnionMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonUnionMemberPubSubType::create_data() { return reinterpret_cast(new CommonUnionMember()); } -void CommonUnionMemberPubSubType::deleteData( +void CommonUnionMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonUnionMemberPubSubType::getKey( +bool CommonUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5830,35 +4878,27 @@ bool CommonUnionMemberPubSubType::getKey( const CommonUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonUnionMember_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 || eprosima_fastdds_dds_xtypes_CommonUnionMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5872,26 +4912,21 @@ void CommonUnionMemberPubSubType::register_type_object_representation() CompleteUnionMemberPubSubType::CompleteUnionMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteUnionMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteUnionMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteUnionMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteUnionMemberPubSubType::~CompleteUnionMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5909,12 +4944,10 @@ bool CompleteUnionMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5929,11 +4962,7 @@ bool CompleteUnionMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5950,11 +4979,7 @@ bool CompleteUnionMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5971,52 +4996,43 @@ bool CompleteUnionMemberPubSubType::deserialize( return true; } -std::function CompleteUnionMemberPubSubType::getSerializedSizeProvider( +uint32_t CompleteUnionMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteUnionMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteUnionMemberPubSubType::create_data() { return reinterpret_cast(new CompleteUnionMember()); } -void CompleteUnionMemberPubSubType::deleteData( +void CompleteUnionMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteUnionMemberPubSubType::getKey( +bool CompleteUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6024,35 +5040,27 @@ bool CompleteUnionMemberPubSubType::getKey( const CompleteUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteUnionMember_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 || eprosima_fastdds_dds_xtypes_CompleteUnionMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6067,26 +5075,21 @@ void CompleteUnionMemberPubSubType::register_type_object_representation() MinimalUnionMemberPubSubType::MinimalUnionMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalUnionMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalUnionMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalUnionMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalUnionMemberPubSubType::~MinimalUnionMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6104,12 +5107,10 @@ bool MinimalUnionMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6124,11 +5125,7 @@ bool MinimalUnionMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6145,11 +5142,7 @@ bool MinimalUnionMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6166,52 +5159,43 @@ bool MinimalUnionMemberPubSubType::deserialize( return true; } -std::function MinimalUnionMemberPubSubType::getSerializedSizeProvider( +uint32_t MinimalUnionMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalUnionMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalUnionMemberPubSubType::create_data() { return reinterpret_cast(new MinimalUnionMember()); } -void MinimalUnionMemberPubSubType::deleteData( +void MinimalUnionMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalUnionMemberPubSubType::getKey( +bool MinimalUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6219,35 +5203,27 @@ bool MinimalUnionMemberPubSubType::getKey( const MinimalUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalUnionMember_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 || eprosima_fastdds_dds_xtypes_MinimalUnionMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6262,26 +5238,21 @@ void MinimalUnionMemberPubSubType::register_type_object_representation() CommonDiscriminatorMemberPubSubType::CommonDiscriminatorMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonDiscriminatorMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonDiscriminatorMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonDiscriminatorMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonDiscriminatorMemberPubSubType::~CommonDiscriminatorMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6299,12 +5270,10 @@ bool CommonDiscriminatorMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6319,11 +5288,7 @@ bool CommonDiscriminatorMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6340,11 +5305,7 @@ bool CommonDiscriminatorMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6361,52 +5322,43 @@ bool CommonDiscriminatorMemberPubSubType::deserialize( return true; } -std::function CommonDiscriminatorMemberPubSubType::getSerializedSizeProvider( +uint32_t CommonDiscriminatorMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonDiscriminatorMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonDiscriminatorMemberPubSubType::create_data() { return reinterpret_cast(new CommonDiscriminatorMember()); } -void CommonDiscriminatorMemberPubSubType::deleteData( +void CommonDiscriminatorMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonDiscriminatorMemberPubSubType::getKey( +bool CommonDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6414,35 +5366,27 @@ bool CommonDiscriminatorMemberPubSubType::getKey( const CommonDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_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 || eprosima_fastdds_dds_xtypes_CommonDiscriminatorMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6456,26 +5400,21 @@ void CommonDiscriminatorMemberPubSubType::register_type_object_representation() CompleteDiscriminatorMemberPubSubType::CompleteDiscriminatorMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteDiscriminatorMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteDiscriminatorMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteDiscriminatorMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteDiscriminatorMemberPubSubType::~CompleteDiscriminatorMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6493,12 +5432,10 @@ bool CompleteDiscriminatorMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6513,11 +5450,7 @@ bool CompleteDiscriminatorMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6534,11 +5467,7 @@ bool CompleteDiscriminatorMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6555,52 +5484,43 @@ bool CompleteDiscriminatorMemberPubSubType::deserialize( return true; } -std::function CompleteDiscriminatorMemberPubSubType::getSerializedSizeProvider( +uint32_t CompleteDiscriminatorMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteDiscriminatorMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteDiscriminatorMemberPubSubType::create_data() { return reinterpret_cast(new CompleteDiscriminatorMember()); } -void CompleteDiscriminatorMemberPubSubType::deleteData( +void CompleteDiscriminatorMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteDiscriminatorMemberPubSubType::getKey( +bool CompleteDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6608,35 +5528,27 @@ bool CompleteDiscriminatorMemberPubSubType::getKey( const CompleteDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_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 || eprosima_fastdds_dds_xtypes_CompleteDiscriminatorMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6650,26 +5562,21 @@ void CompleteDiscriminatorMemberPubSubType::register_type_object_representation( MinimalDiscriminatorMemberPubSubType::MinimalDiscriminatorMemberPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalDiscriminatorMember"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalDiscriminatorMember::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalDiscriminatorMember"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalDiscriminatorMemberPubSubType::~MinimalDiscriminatorMemberPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6687,12 +5594,10 @@ bool MinimalDiscriminatorMemberPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6707,11 +5612,7 @@ bool MinimalDiscriminatorMemberPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6728,11 +5629,7 @@ bool MinimalDiscriminatorMemberPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6749,52 +5646,43 @@ bool MinimalDiscriminatorMemberPubSubType::deserialize( return true; } -std::function MinimalDiscriminatorMemberPubSubType::getSerializedSizeProvider( +uint32_t MinimalDiscriminatorMemberPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalDiscriminatorMemberPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalDiscriminatorMemberPubSubType::create_data() { return reinterpret_cast(new MinimalDiscriminatorMember()); } -void MinimalDiscriminatorMemberPubSubType::deleteData( +void MinimalDiscriminatorMemberPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalDiscriminatorMemberPubSubType::getKey( +bool MinimalDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6802,35 +5690,27 @@ bool MinimalDiscriminatorMemberPubSubType::getKey( const MinimalDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_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 || eprosima_fastdds_dds_xtypes_MinimalDiscriminatorMember_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6844,26 +5724,21 @@ void MinimalDiscriminatorMemberPubSubType::register_type_object_representation() CompleteUnionHeaderPubSubType::CompleteUnionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteUnionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteUnionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteUnionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteUnionHeaderPubSubType::~CompleteUnionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6881,12 +5756,10 @@ bool CompleteUnionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6901,11 +5774,7 @@ bool CompleteUnionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6922,11 +5791,7 @@ bool CompleteUnionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6943,52 +5808,43 @@ bool CompleteUnionHeaderPubSubType::deserialize( return true; } -std::function CompleteUnionHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteUnionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteUnionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteUnionHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteUnionHeader()); } -void CompleteUnionHeaderPubSubType::deleteData( +void CompleteUnionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteUnionHeaderPubSubType::getKey( +bool CompleteUnionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6996,35 +5852,27 @@ bool CompleteUnionHeaderPubSubType::getKey( const CompleteUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteUnionHeader_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 || eprosima_fastdds_dds_xtypes_CompleteUnionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7038,26 +5886,21 @@ void CompleteUnionHeaderPubSubType::register_type_object_representation() MinimalUnionHeaderPubSubType::MinimalUnionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalUnionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalUnionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalUnionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalUnionHeaderPubSubType::~MinimalUnionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7075,12 +5918,10 @@ bool MinimalUnionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7095,11 +5936,7 @@ bool MinimalUnionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7116,11 +5953,7 @@ bool MinimalUnionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7137,52 +5970,43 @@ bool MinimalUnionHeaderPubSubType::deserialize( return true; } -std::function MinimalUnionHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalUnionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalUnionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalUnionHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalUnionHeader()); } -void MinimalUnionHeaderPubSubType::deleteData( +void MinimalUnionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalUnionHeaderPubSubType::getKey( +bool MinimalUnionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7190,35 +6014,27 @@ bool MinimalUnionHeaderPubSubType::getKey( const MinimalUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalUnionHeader_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 || eprosima_fastdds_dds_xtypes_MinimalUnionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7232,26 +6048,21 @@ void MinimalUnionHeaderPubSubType::register_type_object_representation() CompleteUnionTypePubSubType::CompleteUnionTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteUnionType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteUnionType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteUnionType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteUnionType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteUnionType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteUnionType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteUnionType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteUnionType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteUnionTypePubSubType::~CompleteUnionTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7269,12 +6080,10 @@ bool CompleteUnionTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7289,11 +6098,7 @@ bool CompleteUnionTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7310,11 +6115,7 @@ bool CompleteUnionTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7331,52 +6132,43 @@ bool CompleteUnionTypePubSubType::deserialize( return true; } -std::function CompleteUnionTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteUnionTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteUnionTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteUnionTypePubSubType::create_data() { return reinterpret_cast(new CompleteUnionType()); } -void CompleteUnionTypePubSubType::deleteData( +void CompleteUnionTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteUnionTypePubSubType::getKey( +bool CompleteUnionTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7384,35 +6176,27 @@ bool CompleteUnionTypePubSubType::getKey( const CompleteUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteUnionType_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 || eprosima_fastdds_dds_xtypes_CompleteUnionType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7426,26 +6210,21 @@ void CompleteUnionTypePubSubType::register_type_object_representation() MinimalUnionTypePubSubType::MinimalUnionTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalUnionType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalUnionType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalUnionType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalUnionType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalUnionType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalUnionType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalUnionType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalUnionType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalUnionTypePubSubType::~MinimalUnionTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7463,12 +6242,10 @@ bool MinimalUnionTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7483,11 +6260,7 @@ bool MinimalUnionTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7504,11 +6277,7 @@ bool MinimalUnionTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7525,52 +6294,43 @@ bool MinimalUnionTypePubSubType::deserialize( return true; } -std::function MinimalUnionTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalUnionTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalUnionTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalUnionTypePubSubType::create_data() { return reinterpret_cast(new MinimalUnionType()); } -void MinimalUnionTypePubSubType::deleteData( +void MinimalUnionTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalUnionTypePubSubType::getKey( +bool MinimalUnionTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7578,35 +6338,27 @@ bool MinimalUnionTypePubSubType::getKey( const MinimalUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalUnionType_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 || eprosima_fastdds_dds_xtypes_MinimalUnionType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7620,26 +6372,21 @@ void MinimalUnionTypePubSubType::register_type_object_representation() CommonAnnotationParameterPubSubType::CommonAnnotationParameterPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonAnnotationParameter"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonAnnotationParameter::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonAnnotationParameter"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonAnnotationParameterPubSubType::~CommonAnnotationParameterPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7657,12 +6404,10 @@ bool CommonAnnotationParameterPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7677,11 +6422,7 @@ bool CommonAnnotationParameterPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7698,11 +6439,7 @@ bool CommonAnnotationParameterPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7719,52 +6456,43 @@ bool CommonAnnotationParameterPubSubType::deserialize( return true; } -std::function CommonAnnotationParameterPubSubType::getSerializedSizeProvider( +uint32_t CommonAnnotationParameterPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonAnnotationParameterPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonAnnotationParameterPubSubType::create_data() { return reinterpret_cast(new CommonAnnotationParameter()); } -void CommonAnnotationParameterPubSubType::deleteData( +void CommonAnnotationParameterPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonAnnotationParameterPubSubType::getKey( +bool CommonAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7772,35 +6500,27 @@ bool CommonAnnotationParameterPubSubType::getKey( const CommonAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_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 || eprosima_fastdds_dds_xtypes_CommonAnnotationParameter_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7814,26 +6534,21 @@ void CommonAnnotationParameterPubSubType::register_type_object_representation() CompleteAnnotationParameterPubSubType::CompleteAnnotationParameterPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAnnotationParameter"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAnnotationParameter::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAnnotationParameter"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAnnotationParameterPubSubType::~CompleteAnnotationParameterPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7851,12 +6566,10 @@ bool CompleteAnnotationParameterPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7871,11 +6584,7 @@ bool CompleteAnnotationParameterPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7892,11 +6601,7 @@ bool CompleteAnnotationParameterPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7913,52 +6618,43 @@ bool CompleteAnnotationParameterPubSubType::deserialize( return true; } -std::function CompleteAnnotationParameterPubSubType::getSerializedSizeProvider( +uint32_t CompleteAnnotationParameterPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAnnotationParameterPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAnnotationParameterPubSubType::create_data() { return reinterpret_cast(new CompleteAnnotationParameter()); } -void CompleteAnnotationParameterPubSubType::deleteData( +void CompleteAnnotationParameterPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAnnotationParameterPubSubType::getKey( +bool CompleteAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7966,35 +6662,27 @@ bool CompleteAnnotationParameterPubSubType::getKey( const CompleteAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_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 || eprosima_fastdds_dds_xtypes_CompleteAnnotationParameter_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8009,26 +6697,21 @@ void CompleteAnnotationParameterPubSubType::register_type_object_representation( MinimalAnnotationParameterPubSubType::MinimalAnnotationParameterPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAnnotationParameter"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAnnotationParameter::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAnnotationParameter"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAnnotationParameterPubSubType::~MinimalAnnotationParameterPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8046,12 +6729,10 @@ bool MinimalAnnotationParameterPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8066,11 +6747,7 @@ bool MinimalAnnotationParameterPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8087,11 +6764,7 @@ bool MinimalAnnotationParameterPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8108,52 +6781,43 @@ bool MinimalAnnotationParameterPubSubType::deserialize( return true; } -std::function MinimalAnnotationParameterPubSubType::getSerializedSizeProvider( +uint32_t MinimalAnnotationParameterPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAnnotationParameterPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAnnotationParameterPubSubType::create_data() { return reinterpret_cast(new MinimalAnnotationParameter()); } -void MinimalAnnotationParameterPubSubType::deleteData( +void MinimalAnnotationParameterPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAnnotationParameterPubSubType::getKey( +bool MinimalAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8161,35 +6825,27 @@ bool MinimalAnnotationParameterPubSubType::getKey( const MinimalAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_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 || eprosima_fastdds_dds_xtypes_MinimalAnnotationParameter_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8204,26 +6860,21 @@ void MinimalAnnotationParameterPubSubType::register_type_object_representation() CompleteAnnotationHeaderPubSubType::CompleteAnnotationHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAnnotationHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAnnotationHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAnnotationHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAnnotationHeaderPubSubType::~CompleteAnnotationHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8241,12 +6892,10 @@ bool CompleteAnnotationHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8261,11 +6910,7 @@ bool CompleteAnnotationHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8282,11 +6927,7 @@ bool CompleteAnnotationHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8303,52 +6944,43 @@ bool CompleteAnnotationHeaderPubSubType::deserialize( return true; } -std::function CompleteAnnotationHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteAnnotationHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAnnotationHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAnnotationHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteAnnotationHeader()); } -void CompleteAnnotationHeaderPubSubType::deleteData( +void CompleteAnnotationHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAnnotationHeaderPubSubType::getKey( +bool CompleteAnnotationHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8356,35 +6988,27 @@ bool CompleteAnnotationHeaderPubSubType::getKey( const CompleteAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_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 || eprosima_fastdds_dds_xtypes_CompleteAnnotationHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8398,26 +7022,21 @@ void CompleteAnnotationHeaderPubSubType::register_type_object_representation() MinimalAnnotationHeaderPubSubType::MinimalAnnotationHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAnnotationHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAnnotationHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAnnotationHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAnnotationHeaderPubSubType::~MinimalAnnotationHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8435,12 +7054,10 @@ bool MinimalAnnotationHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8455,11 +7072,7 @@ bool MinimalAnnotationHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8476,11 +7089,7 @@ bool MinimalAnnotationHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8497,52 +7106,43 @@ bool MinimalAnnotationHeaderPubSubType::deserialize( return true; } -std::function MinimalAnnotationHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalAnnotationHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAnnotationHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAnnotationHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalAnnotationHeader()); } -void MinimalAnnotationHeaderPubSubType::deleteData( +void MinimalAnnotationHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAnnotationHeaderPubSubType::getKey( +bool MinimalAnnotationHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8550,35 +7150,27 @@ bool MinimalAnnotationHeaderPubSubType::getKey( const MinimalAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_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 || eprosima_fastdds_dds_xtypes_MinimalAnnotationHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8592,26 +7184,21 @@ void MinimalAnnotationHeaderPubSubType::register_type_object_representation() CompleteAnnotationTypePubSubType::CompleteAnnotationTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAnnotationType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAnnotationType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAnnotationType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAnnotationTypePubSubType::~CompleteAnnotationTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8629,12 +7216,10 @@ bool CompleteAnnotationTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8649,11 +7234,7 @@ bool CompleteAnnotationTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8670,11 +7251,7 @@ bool CompleteAnnotationTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8691,52 +7268,43 @@ bool CompleteAnnotationTypePubSubType::deserialize( return true; } -std::function CompleteAnnotationTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteAnnotationTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAnnotationTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAnnotationTypePubSubType::create_data() { return reinterpret_cast(new CompleteAnnotationType()); } -void CompleteAnnotationTypePubSubType::deleteData( +void CompleteAnnotationTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAnnotationTypePubSubType::getKey( +bool CompleteAnnotationTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8744,35 +7312,27 @@ bool CompleteAnnotationTypePubSubType::getKey( const CompleteAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAnnotationType_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 || eprosima_fastdds_dds_xtypes_CompleteAnnotationType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8786,26 +7346,21 @@ void CompleteAnnotationTypePubSubType::register_type_object_representation() MinimalAnnotationTypePubSubType::MinimalAnnotationTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAnnotationType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAnnotationType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAnnotationType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAnnotationTypePubSubType::~MinimalAnnotationTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8823,12 +7378,10 @@ bool MinimalAnnotationTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8843,11 +7396,7 @@ bool MinimalAnnotationTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8864,11 +7413,7 @@ bool MinimalAnnotationTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8885,52 +7430,43 @@ bool MinimalAnnotationTypePubSubType::deserialize( return true; } -std::function MinimalAnnotationTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalAnnotationTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAnnotationTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAnnotationTypePubSubType::create_data() { return reinterpret_cast(new MinimalAnnotationType()); } -void MinimalAnnotationTypePubSubType::deleteData( +void MinimalAnnotationTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAnnotationTypePubSubType::getKey( +bool MinimalAnnotationTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8938,35 +7474,27 @@ bool MinimalAnnotationTypePubSubType::getKey( const MinimalAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAnnotationType_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 || eprosima_fastdds_dds_xtypes_MinimalAnnotationType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8980,26 +7508,21 @@ void MinimalAnnotationTypePubSubType::register_type_object_representation() CommonAliasBodyPubSubType::CommonAliasBodyPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonAliasBody"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonAliasBody::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonAliasBody_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonAliasBody"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonAliasBody_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonAliasBody_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonAliasBody_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonAliasBodyPubSubType::~CommonAliasBodyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9017,12 +7540,10 @@ bool CommonAliasBodyPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9037,11 +7558,7 @@ bool CommonAliasBodyPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9058,11 +7575,7 @@ bool CommonAliasBodyPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9079,52 +7592,43 @@ bool CommonAliasBodyPubSubType::deserialize( return true; } -std::function CommonAliasBodyPubSubType::getSerializedSizeProvider( +uint32_t CommonAliasBodyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonAliasBodyPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonAliasBodyPubSubType::create_data() { return reinterpret_cast(new CommonAliasBody()); } -void CommonAliasBodyPubSubType::deleteData( +void CommonAliasBodyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonAliasBodyPubSubType::getKey( +bool CommonAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9132,35 +7636,27 @@ bool CommonAliasBodyPubSubType::getKey( const CommonAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonAliasBody_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 || eprosima_fastdds_dds_xtypes_CommonAliasBody_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9174,26 +7670,21 @@ void CommonAliasBodyPubSubType::register_type_object_representation() CompleteAliasBodyPubSubType::CompleteAliasBodyPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAliasBody"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAliasBody::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAliasBody"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAliasBodyPubSubType::~CompleteAliasBodyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9211,12 +7702,10 @@ bool CompleteAliasBodyPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9231,11 +7720,7 @@ bool CompleteAliasBodyPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9252,11 +7737,7 @@ bool CompleteAliasBodyPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9273,52 +7754,43 @@ bool CompleteAliasBodyPubSubType::deserialize( return true; } -std::function CompleteAliasBodyPubSubType::getSerializedSizeProvider( +uint32_t CompleteAliasBodyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAliasBodyPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAliasBodyPubSubType::create_data() { return reinterpret_cast(new CompleteAliasBody()); } -void CompleteAliasBodyPubSubType::deleteData( +void CompleteAliasBodyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAliasBodyPubSubType::getKey( +bool CompleteAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9326,35 +7798,27 @@ bool CompleteAliasBodyPubSubType::getKey( const CompleteAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAliasBody_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 || eprosima_fastdds_dds_xtypes_CompleteAliasBody_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9368,26 +7832,21 @@ void CompleteAliasBodyPubSubType::register_type_object_representation() MinimalAliasBodyPubSubType::MinimalAliasBodyPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAliasBody"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAliasBody::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAliasBody"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAliasBodyPubSubType::~MinimalAliasBodyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9405,12 +7864,10 @@ bool MinimalAliasBodyPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9425,11 +7882,7 @@ bool MinimalAliasBodyPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9446,11 +7899,7 @@ bool MinimalAliasBodyPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9467,52 +7916,43 @@ bool MinimalAliasBodyPubSubType::deserialize( return true; } -std::function MinimalAliasBodyPubSubType::getSerializedSizeProvider( +uint32_t MinimalAliasBodyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAliasBodyPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAliasBodyPubSubType::create_data() { return reinterpret_cast(new MinimalAliasBody()); } -void MinimalAliasBodyPubSubType::deleteData( +void MinimalAliasBodyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAliasBodyPubSubType::getKey( +bool MinimalAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9520,35 +7960,27 @@ bool MinimalAliasBodyPubSubType::getKey( const MinimalAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAliasBody_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 || eprosima_fastdds_dds_xtypes_MinimalAliasBody_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9562,26 +7994,21 @@ void MinimalAliasBodyPubSubType::register_type_object_representation() CompleteAliasHeaderPubSubType::CompleteAliasHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAliasHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAliasHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAliasHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAliasHeaderPubSubType::~CompleteAliasHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9599,12 +8026,10 @@ bool CompleteAliasHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9619,11 +8044,7 @@ bool CompleteAliasHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9640,11 +8061,7 @@ bool CompleteAliasHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9661,52 +8078,43 @@ bool CompleteAliasHeaderPubSubType::deserialize( return true; } -std::function CompleteAliasHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteAliasHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAliasHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAliasHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteAliasHeader()); } -void CompleteAliasHeaderPubSubType::deleteData( +void CompleteAliasHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAliasHeaderPubSubType::getKey( +bool CompleteAliasHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9714,35 +8122,27 @@ bool CompleteAliasHeaderPubSubType::getKey( const CompleteAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAliasHeader_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 || eprosima_fastdds_dds_xtypes_CompleteAliasHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9756,26 +8156,21 @@ void CompleteAliasHeaderPubSubType::register_type_object_representation() MinimalAliasHeaderPubSubType::MinimalAliasHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAliasHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAliasHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAliasHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAliasHeaderPubSubType::~MinimalAliasHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9793,12 +8188,10 @@ bool MinimalAliasHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9813,11 +8206,7 @@ bool MinimalAliasHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9834,11 +8223,7 @@ bool MinimalAliasHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9855,52 +8240,43 @@ bool MinimalAliasHeaderPubSubType::deserialize( return true; } -std::function MinimalAliasHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalAliasHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAliasHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAliasHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalAliasHeader()); } -void MinimalAliasHeaderPubSubType::deleteData( +void MinimalAliasHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAliasHeaderPubSubType::getKey( +bool MinimalAliasHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9908,35 +8284,27 @@ bool MinimalAliasHeaderPubSubType::getKey( const MinimalAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAliasHeader_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 || eprosima_fastdds_dds_xtypes_MinimalAliasHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9950,26 +8318,21 @@ void MinimalAliasHeaderPubSubType::register_type_object_representation() CompleteAliasTypePubSubType::CompleteAliasTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteAliasType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteAliasType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteAliasType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteAliasType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteAliasType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteAliasType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteAliasType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteAliasType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteAliasTypePubSubType::~CompleteAliasTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9987,12 +8350,10 @@ bool CompleteAliasTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10007,11 +8368,7 @@ bool CompleteAliasTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10028,11 +8385,7 @@ bool CompleteAliasTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10049,52 +8402,43 @@ bool CompleteAliasTypePubSubType::deserialize( return true; } -std::function CompleteAliasTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteAliasTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteAliasTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteAliasTypePubSubType::create_data() { return reinterpret_cast(new CompleteAliasType()); } -void CompleteAliasTypePubSubType::deleteData( +void CompleteAliasTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteAliasTypePubSubType::getKey( +bool CompleteAliasTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10102,35 +8446,27 @@ bool CompleteAliasTypePubSubType::getKey( const CompleteAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteAliasType_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 || eprosima_fastdds_dds_xtypes_CompleteAliasType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10144,26 +8480,21 @@ void CompleteAliasTypePubSubType::register_type_object_representation() MinimalAliasTypePubSubType::MinimalAliasTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalAliasType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalAliasType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalAliasType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalAliasType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalAliasType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalAliasType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalAliasType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalAliasType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalAliasTypePubSubType::~MinimalAliasTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10181,12 +8512,10 @@ bool MinimalAliasTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10201,11 +8530,7 @@ bool MinimalAliasTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10222,11 +8547,7 @@ bool MinimalAliasTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10243,52 +8564,43 @@ bool MinimalAliasTypePubSubType::deserialize( return true; } -std::function MinimalAliasTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalAliasTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalAliasTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalAliasTypePubSubType::create_data() { return reinterpret_cast(new MinimalAliasType()); } -void MinimalAliasTypePubSubType::deleteData( +void MinimalAliasTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalAliasTypePubSubType::getKey( +bool MinimalAliasTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10296,35 +8608,27 @@ bool MinimalAliasTypePubSubType::getKey( const MinimalAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalAliasType_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 || eprosima_fastdds_dds_xtypes_MinimalAliasType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10338,26 +8642,21 @@ void MinimalAliasTypePubSubType::register_type_object_representation() CompleteElementDetailPubSubType::CompleteElementDetailPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteElementDetail"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteElementDetail::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteElementDetail"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteElementDetailPubSubType::~CompleteElementDetailPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10375,12 +8674,10 @@ bool CompleteElementDetailPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10395,11 +8692,7 @@ bool CompleteElementDetailPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10416,11 +8709,7 @@ bool CompleteElementDetailPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10437,52 +8726,43 @@ bool CompleteElementDetailPubSubType::deserialize( return true; } -std::function CompleteElementDetailPubSubType::getSerializedSizeProvider( +uint32_t CompleteElementDetailPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteElementDetailPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteElementDetailPubSubType::create_data() { return reinterpret_cast(new CompleteElementDetail()); } -void CompleteElementDetailPubSubType::deleteData( +void CompleteElementDetailPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteElementDetailPubSubType::getKey( +bool CompleteElementDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10490,35 +8770,27 @@ bool CompleteElementDetailPubSubType::getKey( const CompleteElementDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteElementDetail_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 || eprosima_fastdds_dds_xtypes_CompleteElementDetail_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10532,26 +8804,21 @@ void CompleteElementDetailPubSubType::register_type_object_representation() CommonCollectionElementPubSubType::CommonCollectionElementPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonCollectionElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonCollectionElement::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonCollectionElement"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonCollectionElementPubSubType::~CommonCollectionElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10569,12 +8836,10 @@ bool CommonCollectionElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10589,11 +8854,7 @@ bool CommonCollectionElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10610,11 +8871,7 @@ bool CommonCollectionElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10631,52 +8888,43 @@ bool CommonCollectionElementPubSubType::deserialize( return true; } -std::function CommonCollectionElementPubSubType::getSerializedSizeProvider( +uint32_t CommonCollectionElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonCollectionElementPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonCollectionElementPubSubType::create_data() { return reinterpret_cast(new CommonCollectionElement()); } -void CommonCollectionElementPubSubType::deleteData( +void CommonCollectionElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonCollectionElementPubSubType::getKey( +bool CommonCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10684,35 +8932,27 @@ bool CommonCollectionElementPubSubType::getKey( const CommonCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonCollectionElement_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 || eprosima_fastdds_dds_xtypes_CommonCollectionElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10726,26 +8966,21 @@ void CommonCollectionElementPubSubType::register_type_object_representation() CompleteCollectionElementPubSubType::CompleteCollectionElementPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteCollectionElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteCollectionElement::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteCollectionElement"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteCollectionElementPubSubType::~CompleteCollectionElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10763,12 +8998,10 @@ bool CompleteCollectionElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10783,11 +9016,7 @@ bool CompleteCollectionElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10804,11 +9033,7 @@ bool CompleteCollectionElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10825,52 +9050,43 @@ bool CompleteCollectionElementPubSubType::deserialize( return true; } -std::function CompleteCollectionElementPubSubType::getSerializedSizeProvider( +uint32_t CompleteCollectionElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteCollectionElementPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteCollectionElementPubSubType::create_data() { return reinterpret_cast(new CompleteCollectionElement()); } -void CompleteCollectionElementPubSubType::deleteData( +void CompleteCollectionElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteCollectionElementPubSubType::getKey( +bool CompleteCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10878,35 +9094,27 @@ bool CompleteCollectionElementPubSubType::getKey( const CompleteCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteCollectionElement_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 || eprosima_fastdds_dds_xtypes_CompleteCollectionElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10920,26 +9128,21 @@ void CompleteCollectionElementPubSubType::register_type_object_representation() MinimalCollectionElementPubSubType::MinimalCollectionElementPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalCollectionElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalCollectionElement::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalCollectionElement"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalCollectionElementPubSubType::~MinimalCollectionElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10957,12 +9160,10 @@ bool MinimalCollectionElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10977,11 +9178,7 @@ bool MinimalCollectionElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10998,11 +9195,7 @@ bool MinimalCollectionElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11019,52 +9212,43 @@ bool MinimalCollectionElementPubSubType::deserialize( return true; } -std::function MinimalCollectionElementPubSubType::getSerializedSizeProvider( +uint32_t MinimalCollectionElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalCollectionElementPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalCollectionElementPubSubType::create_data() { return reinterpret_cast(new MinimalCollectionElement()); } -void MinimalCollectionElementPubSubType::deleteData( +void MinimalCollectionElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalCollectionElementPubSubType::getKey( +bool MinimalCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11072,35 +9256,27 @@ bool MinimalCollectionElementPubSubType::getKey( const MinimalCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalCollectionElement_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 || eprosima_fastdds_dds_xtypes_MinimalCollectionElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11114,26 +9290,21 @@ void MinimalCollectionElementPubSubType::register_type_object_representation() CommonCollectionHeaderPubSubType::CommonCollectionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonCollectionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonCollectionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonCollectionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonCollectionHeaderPubSubType::~CommonCollectionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11151,12 +9322,10 @@ bool CommonCollectionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11171,11 +9340,7 @@ bool CommonCollectionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11192,11 +9357,7 @@ bool CommonCollectionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11213,52 +9374,43 @@ bool CommonCollectionHeaderPubSubType::deserialize( return true; } -std::function CommonCollectionHeaderPubSubType::getSerializedSizeProvider( +uint32_t CommonCollectionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonCollectionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonCollectionHeaderPubSubType::create_data() { return reinterpret_cast(new CommonCollectionHeader()); } -void CommonCollectionHeaderPubSubType::deleteData( +void CommonCollectionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonCollectionHeaderPubSubType::getKey( +bool CommonCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11266,35 +9418,27 @@ bool CommonCollectionHeaderPubSubType::getKey( const CommonCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonCollectionHeader_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 || eprosima_fastdds_dds_xtypes_CommonCollectionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11308,26 +9452,21 @@ void CommonCollectionHeaderPubSubType::register_type_object_representation() CompleteCollectionHeaderPubSubType::CompleteCollectionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteCollectionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteCollectionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteCollectionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteCollectionHeaderPubSubType::~CompleteCollectionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11345,12 +9484,10 @@ bool CompleteCollectionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11365,11 +9502,7 @@ bool CompleteCollectionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11386,11 +9519,7 @@ bool CompleteCollectionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11407,52 +9536,43 @@ bool CompleteCollectionHeaderPubSubType::deserialize( return true; } -std::function CompleteCollectionHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteCollectionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteCollectionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteCollectionHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteCollectionHeader()); } -void CompleteCollectionHeaderPubSubType::deleteData( +void CompleteCollectionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteCollectionHeaderPubSubType::getKey( +bool CompleteCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11460,35 +9580,27 @@ bool CompleteCollectionHeaderPubSubType::getKey( const CompleteCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_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 || eprosima_fastdds_dds_xtypes_CompleteCollectionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11502,26 +9614,21 @@ void CompleteCollectionHeaderPubSubType::register_type_object_representation() MinimalCollectionHeaderPubSubType::MinimalCollectionHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalCollectionHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalCollectionHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalCollectionHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalCollectionHeaderPubSubType::~MinimalCollectionHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11539,12 +9646,10 @@ bool MinimalCollectionHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11559,11 +9664,7 @@ bool MinimalCollectionHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11580,11 +9681,7 @@ bool MinimalCollectionHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11601,52 +9698,43 @@ bool MinimalCollectionHeaderPubSubType::deserialize( return true; } -std::function MinimalCollectionHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalCollectionHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalCollectionHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalCollectionHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalCollectionHeader()); } -void MinimalCollectionHeaderPubSubType::deleteData( +void MinimalCollectionHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalCollectionHeaderPubSubType::getKey( +bool MinimalCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11654,35 +9742,27 @@ bool MinimalCollectionHeaderPubSubType::getKey( const MinimalCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_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 || eprosima_fastdds_dds_xtypes_MinimalCollectionHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11696,26 +9776,21 @@ void MinimalCollectionHeaderPubSubType::register_type_object_representation() CompleteSequenceTypePubSubType::CompleteSequenceTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteSequenceType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteSequenceType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteSequenceType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteSequenceTypePubSubType::~CompleteSequenceTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11733,12 +9808,10 @@ bool CompleteSequenceTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11753,11 +9826,7 @@ bool CompleteSequenceTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11774,11 +9843,7 @@ bool CompleteSequenceTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11795,52 +9860,43 @@ bool CompleteSequenceTypePubSubType::deserialize( return true; } -std::function CompleteSequenceTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteSequenceTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteSequenceTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteSequenceTypePubSubType::create_data() { return reinterpret_cast(new CompleteSequenceType()); } -void CompleteSequenceTypePubSubType::deleteData( +void CompleteSequenceTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteSequenceTypePubSubType::getKey( +bool CompleteSequenceTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11848,35 +9904,27 @@ bool CompleteSequenceTypePubSubType::getKey( const CompleteSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteSequenceType_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 || eprosima_fastdds_dds_xtypes_CompleteSequenceType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11890,26 +9938,21 @@ void CompleteSequenceTypePubSubType::register_type_object_representation() MinimalSequenceTypePubSubType::MinimalSequenceTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalSequenceType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalSequenceType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalSequenceType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalSequenceTypePubSubType::~MinimalSequenceTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11927,12 +9970,10 @@ bool MinimalSequenceTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11947,11 +9988,7 @@ bool MinimalSequenceTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11968,11 +10005,7 @@ bool MinimalSequenceTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11989,52 +10022,43 @@ bool MinimalSequenceTypePubSubType::deserialize( return true; } -std::function MinimalSequenceTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalSequenceTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalSequenceTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalSequenceTypePubSubType::create_data() { return reinterpret_cast(new MinimalSequenceType()); } -void MinimalSequenceTypePubSubType::deleteData( +void MinimalSequenceTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalSequenceTypePubSubType::getKey( +bool MinimalSequenceTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12042,35 +10066,27 @@ bool MinimalSequenceTypePubSubType::getKey( const MinimalSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalSequenceType_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 || eprosima_fastdds_dds_xtypes_MinimalSequenceType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12084,26 +10100,21 @@ void MinimalSequenceTypePubSubType::register_type_object_representation() CommonArrayHeaderPubSubType::CommonArrayHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonArrayHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonArrayHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonArrayHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonArrayHeaderPubSubType::~CommonArrayHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12121,12 +10132,10 @@ bool CommonArrayHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12141,11 +10150,7 @@ bool CommonArrayHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12162,11 +10167,7 @@ bool CommonArrayHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12183,52 +10184,43 @@ bool CommonArrayHeaderPubSubType::deserialize( return true; } -std::function CommonArrayHeaderPubSubType::getSerializedSizeProvider( +uint32_t CommonArrayHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonArrayHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonArrayHeaderPubSubType::create_data() { return reinterpret_cast(new CommonArrayHeader()); } -void CommonArrayHeaderPubSubType::deleteData( +void CommonArrayHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonArrayHeaderPubSubType::getKey( +bool CommonArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12236,35 +10228,27 @@ bool CommonArrayHeaderPubSubType::getKey( const CommonArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonArrayHeader_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 || eprosima_fastdds_dds_xtypes_CommonArrayHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12278,26 +10262,21 @@ void CommonArrayHeaderPubSubType::register_type_object_representation() CompleteArrayHeaderPubSubType::CompleteArrayHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteArrayHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteArrayHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteArrayHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteArrayHeaderPubSubType::~CompleteArrayHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12315,12 +10294,10 @@ bool CompleteArrayHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12335,11 +10312,7 @@ bool CompleteArrayHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12356,11 +10329,7 @@ bool CompleteArrayHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12377,52 +10346,43 @@ bool CompleteArrayHeaderPubSubType::deserialize( return true; } -std::function CompleteArrayHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteArrayHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteArrayHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteArrayHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteArrayHeader()); } -void CompleteArrayHeaderPubSubType::deleteData( +void CompleteArrayHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteArrayHeaderPubSubType::getKey( +bool CompleteArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12430,35 +10390,27 @@ bool CompleteArrayHeaderPubSubType::getKey( const CompleteArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteArrayHeader_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 || eprosima_fastdds_dds_xtypes_CompleteArrayHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12472,26 +10424,21 @@ void CompleteArrayHeaderPubSubType::register_type_object_representation() MinimalArrayHeaderPubSubType::MinimalArrayHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalArrayHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalArrayHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalArrayHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalArrayHeaderPubSubType::~MinimalArrayHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12509,12 +10456,10 @@ bool MinimalArrayHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12529,11 +10474,7 @@ bool MinimalArrayHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12550,11 +10491,7 @@ bool MinimalArrayHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12571,52 +10508,43 @@ bool MinimalArrayHeaderPubSubType::deserialize( return true; } -std::function MinimalArrayHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalArrayHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalArrayHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalArrayHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalArrayHeader()); } -void MinimalArrayHeaderPubSubType::deleteData( +void MinimalArrayHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalArrayHeaderPubSubType::getKey( +bool MinimalArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12624,35 +10552,27 @@ bool MinimalArrayHeaderPubSubType::getKey( const MinimalArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalArrayHeader_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 || eprosima_fastdds_dds_xtypes_MinimalArrayHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12666,26 +10586,21 @@ void MinimalArrayHeaderPubSubType::register_type_object_representation() CompleteArrayTypePubSubType::CompleteArrayTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteArrayType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteArrayType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteArrayType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteArrayType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteArrayType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteArrayType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteArrayType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteArrayType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteArrayType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteArrayTypePubSubType::~CompleteArrayTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12703,12 +10618,10 @@ bool CompleteArrayTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12723,11 +10636,7 @@ bool CompleteArrayTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12744,11 +10653,7 @@ bool CompleteArrayTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12765,52 +10670,43 @@ bool CompleteArrayTypePubSubType::deserialize( return true; } -std::function CompleteArrayTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteArrayTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteArrayTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteArrayTypePubSubType::create_data() { return reinterpret_cast(new CompleteArrayType()); } -void CompleteArrayTypePubSubType::deleteData( +void CompleteArrayTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteArrayTypePubSubType::getKey( +bool CompleteArrayTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12818,35 +10714,27 @@ bool CompleteArrayTypePubSubType::getKey( const CompleteArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteArrayType_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 || eprosima_fastdds_dds_xtypes_CompleteArrayType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12860,26 +10748,21 @@ void CompleteArrayTypePubSubType::register_type_object_representation() MinimalArrayTypePubSubType::MinimalArrayTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalArrayType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalArrayType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalArrayType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalArrayType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalArrayType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalArrayType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalArrayType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalArrayType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalArrayType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalArrayTypePubSubType::~MinimalArrayTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12897,12 +10780,10 @@ bool MinimalArrayTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12917,11 +10798,7 @@ bool MinimalArrayTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12938,11 +10815,7 @@ bool MinimalArrayTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12959,52 +10832,43 @@ bool MinimalArrayTypePubSubType::deserialize( return true; } -std::function MinimalArrayTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalArrayTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalArrayTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalArrayTypePubSubType::create_data() { return reinterpret_cast(new MinimalArrayType()); } -void MinimalArrayTypePubSubType::deleteData( +void MinimalArrayTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalArrayTypePubSubType::getKey( +bool MinimalArrayTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13012,35 +10876,27 @@ bool MinimalArrayTypePubSubType::getKey( const MinimalArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalArrayType_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 || eprosima_fastdds_dds_xtypes_MinimalArrayType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13054,26 +10910,21 @@ void MinimalArrayTypePubSubType::register_type_object_representation() CompleteMapTypePubSubType::CompleteMapTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteMapType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteMapType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteMapType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteMapType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteMapType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteMapType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteMapType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteMapType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteMapType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteMapTypePubSubType::~CompleteMapTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13091,12 +10942,10 @@ bool CompleteMapTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13111,11 +10960,7 @@ bool CompleteMapTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13132,11 +10977,7 @@ bool CompleteMapTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13153,52 +10994,43 @@ bool CompleteMapTypePubSubType::deserialize( return true; } -std::function CompleteMapTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteMapTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteMapTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteMapTypePubSubType::create_data() { return reinterpret_cast(new CompleteMapType()); } -void CompleteMapTypePubSubType::deleteData( +void CompleteMapTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteMapTypePubSubType::getKey( +bool CompleteMapTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13206,35 +11038,27 @@ bool CompleteMapTypePubSubType::getKey( const CompleteMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteMapType_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 || eprosima_fastdds_dds_xtypes_CompleteMapType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13248,26 +11072,21 @@ void CompleteMapTypePubSubType::register_type_object_representation() MinimalMapTypePubSubType::MinimalMapTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalMapType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalMapType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalMapType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalMapType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalMapType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalMapType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalMapType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalMapType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalMapType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalMapTypePubSubType::~MinimalMapTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13285,12 +11104,10 @@ bool MinimalMapTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13305,11 +11122,7 @@ bool MinimalMapTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13326,11 +11139,7 @@ bool MinimalMapTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13347,52 +11156,43 @@ bool MinimalMapTypePubSubType::deserialize( return true; } -std::function MinimalMapTypePubSubType::getSerializedSizeProvider( - const void* const data, - DataRepresentationId_t data_representation) -{ - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalMapTypePubSubType::createData() +uint32_t MinimalMapTypePubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalMapTypePubSubType::create_data() { return reinterpret_cast(new MinimalMapType()); } -void MinimalMapTypePubSubType::deleteData( +void MinimalMapTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalMapTypePubSubType::getKey( +bool MinimalMapTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13400,35 +11200,27 @@ bool MinimalMapTypePubSubType::getKey( const MinimalMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalMapType_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 || eprosima_fastdds_dds_xtypes_MinimalMapType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13443,26 +11235,21 @@ void MinimalMapTypePubSubType::register_type_object_representation() CommonEnumeratedLiteralPubSubType::CommonEnumeratedLiteralPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonEnumeratedLiteral"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonEnumeratedLiteral::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonEnumeratedLiteral"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonEnumeratedLiteralPubSubType::~CommonEnumeratedLiteralPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13480,12 +11267,10 @@ bool CommonEnumeratedLiteralPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13500,11 +11285,7 @@ bool CommonEnumeratedLiteralPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13521,11 +11302,7 @@ bool CommonEnumeratedLiteralPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13542,52 +11319,43 @@ bool CommonEnumeratedLiteralPubSubType::deserialize( return true; } -std::function CommonEnumeratedLiteralPubSubType::getSerializedSizeProvider( +uint32_t CommonEnumeratedLiteralPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonEnumeratedLiteralPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonEnumeratedLiteralPubSubType::create_data() { return reinterpret_cast(new CommonEnumeratedLiteral()); } -void CommonEnumeratedLiteralPubSubType::deleteData( +void CommonEnumeratedLiteralPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonEnumeratedLiteralPubSubType::getKey( +bool CommonEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13595,35 +11363,27 @@ bool CommonEnumeratedLiteralPubSubType::getKey( const CommonEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_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 || eprosima_fastdds_dds_xtypes_CommonEnumeratedLiteral_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13637,26 +11397,21 @@ void CommonEnumeratedLiteralPubSubType::register_type_object_representation() CompleteEnumeratedLiteralPubSubType::CompleteEnumeratedLiteralPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteEnumeratedLiteral"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteEnumeratedLiteral::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteEnumeratedLiteral"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteEnumeratedLiteralPubSubType::~CompleteEnumeratedLiteralPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13674,12 +11429,10 @@ bool CompleteEnumeratedLiteralPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13694,11 +11447,7 @@ bool CompleteEnumeratedLiteralPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13715,11 +11464,7 @@ bool CompleteEnumeratedLiteralPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13736,52 +11481,43 @@ bool CompleteEnumeratedLiteralPubSubType::deserialize( return true; } -std::function CompleteEnumeratedLiteralPubSubType::getSerializedSizeProvider( +uint32_t CompleteEnumeratedLiteralPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteEnumeratedLiteralPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteEnumeratedLiteralPubSubType::create_data() { return reinterpret_cast(new CompleteEnumeratedLiteral()); } -void CompleteEnumeratedLiteralPubSubType::deleteData( +void CompleteEnumeratedLiteralPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteEnumeratedLiteralPubSubType::getKey( +bool CompleteEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13789,35 +11525,27 @@ bool CompleteEnumeratedLiteralPubSubType::getKey( const CompleteEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_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 || eprosima_fastdds_dds_xtypes_CompleteEnumeratedLiteral_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13832,26 +11560,21 @@ void CompleteEnumeratedLiteralPubSubType::register_type_object_representation() MinimalEnumeratedLiteralPubSubType::MinimalEnumeratedLiteralPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalEnumeratedLiteral"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalEnumeratedLiteral::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalEnumeratedLiteral"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalEnumeratedLiteralPubSubType::~MinimalEnumeratedLiteralPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13869,12 +11592,10 @@ bool MinimalEnumeratedLiteralPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13889,11 +11610,7 @@ bool MinimalEnumeratedLiteralPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13910,11 +11627,7 @@ bool MinimalEnumeratedLiteralPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13931,52 +11644,43 @@ bool MinimalEnumeratedLiteralPubSubType::deserialize( return true; } -std::function MinimalEnumeratedLiteralPubSubType::getSerializedSizeProvider( +uint32_t MinimalEnumeratedLiteralPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalEnumeratedLiteralPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalEnumeratedLiteralPubSubType::create_data() { return reinterpret_cast(new MinimalEnumeratedLiteral()); } -void MinimalEnumeratedLiteralPubSubType::deleteData( +void MinimalEnumeratedLiteralPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalEnumeratedLiteralPubSubType::getKey( +bool MinimalEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13984,35 +11688,27 @@ bool MinimalEnumeratedLiteralPubSubType::getKey( const MinimalEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_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 || eprosima_fastdds_dds_xtypes_MinimalEnumeratedLiteral_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14027,26 +11723,21 @@ void MinimalEnumeratedLiteralPubSubType::register_type_object_representation() CommonEnumeratedHeaderPubSubType::CommonEnumeratedHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonEnumeratedHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonEnumeratedHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonEnumeratedHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonEnumeratedHeaderPubSubType::~CommonEnumeratedHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14064,12 +11755,10 @@ bool CommonEnumeratedHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14084,11 +11773,7 @@ bool CommonEnumeratedHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14105,11 +11790,7 @@ bool CommonEnumeratedHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14126,52 +11807,43 @@ bool CommonEnumeratedHeaderPubSubType::deserialize( return true; } -std::function CommonEnumeratedHeaderPubSubType::getSerializedSizeProvider( +uint32_t CommonEnumeratedHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonEnumeratedHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonEnumeratedHeaderPubSubType::create_data() { return reinterpret_cast(new CommonEnumeratedHeader()); } -void CommonEnumeratedHeaderPubSubType::deleteData( +void CommonEnumeratedHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonEnumeratedHeaderPubSubType::getKey( +bool CommonEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14179,35 +11851,27 @@ bool CommonEnumeratedHeaderPubSubType::getKey( const CommonEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_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 || eprosima_fastdds_dds_xtypes_CommonEnumeratedHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14221,26 +11885,21 @@ void CommonEnumeratedHeaderPubSubType::register_type_object_representation() CompleteEnumeratedHeaderPubSubType::CompleteEnumeratedHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteEnumeratedHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteEnumeratedHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteEnumeratedHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteEnumeratedHeaderPubSubType::~CompleteEnumeratedHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14258,12 +11917,10 @@ bool CompleteEnumeratedHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14278,11 +11935,7 @@ bool CompleteEnumeratedHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14299,11 +11952,7 @@ bool CompleteEnumeratedHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14320,52 +11969,43 @@ bool CompleteEnumeratedHeaderPubSubType::deserialize( return true; } -std::function CompleteEnumeratedHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteEnumeratedHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteEnumeratedHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteEnumeratedHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteEnumeratedHeader()); } -void CompleteEnumeratedHeaderPubSubType::deleteData( +void CompleteEnumeratedHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteEnumeratedHeaderPubSubType::getKey( +bool CompleteEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14373,35 +12013,27 @@ bool CompleteEnumeratedHeaderPubSubType::getKey( const CompleteEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_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 || eprosima_fastdds_dds_xtypes_CompleteEnumeratedHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14415,26 +12047,21 @@ void CompleteEnumeratedHeaderPubSubType::register_type_object_representation() MinimalEnumeratedHeaderPubSubType::MinimalEnumeratedHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalEnumeratedHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalEnumeratedHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalEnumeratedHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalEnumeratedHeaderPubSubType::~MinimalEnumeratedHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14452,12 +12079,10 @@ bool MinimalEnumeratedHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14472,11 +12097,7 @@ bool MinimalEnumeratedHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14493,11 +12114,7 @@ bool MinimalEnumeratedHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14514,52 +12131,43 @@ bool MinimalEnumeratedHeaderPubSubType::deserialize( return true; } -std::function MinimalEnumeratedHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalEnumeratedHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalEnumeratedHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalEnumeratedHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalEnumeratedHeader()); } -void MinimalEnumeratedHeaderPubSubType::deleteData( +void MinimalEnumeratedHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalEnumeratedHeaderPubSubType::getKey( +bool MinimalEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14567,35 +12175,27 @@ bool MinimalEnumeratedHeaderPubSubType::getKey( const MinimalEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_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 || eprosima_fastdds_dds_xtypes_MinimalEnumeratedHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14609,26 +12209,21 @@ void MinimalEnumeratedHeaderPubSubType::register_type_object_representation() CompleteEnumeratedTypePubSubType::CompleteEnumeratedTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteEnumeratedType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteEnumeratedType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteEnumeratedType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteEnumeratedTypePubSubType::~CompleteEnumeratedTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14646,12 +12241,10 @@ bool CompleteEnumeratedTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14666,11 +12259,7 @@ bool CompleteEnumeratedTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14687,11 +12276,7 @@ bool CompleteEnumeratedTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14708,52 +12293,43 @@ bool CompleteEnumeratedTypePubSubType::deserialize( return true; } -std::function CompleteEnumeratedTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteEnumeratedTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteEnumeratedTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteEnumeratedTypePubSubType::create_data() { return reinterpret_cast(new CompleteEnumeratedType()); } -void CompleteEnumeratedTypePubSubType::deleteData( +void CompleteEnumeratedTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteEnumeratedTypePubSubType::getKey( +bool CompleteEnumeratedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14761,35 +12337,27 @@ bool CompleteEnumeratedTypePubSubType::getKey( const CompleteEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_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 || eprosima_fastdds_dds_xtypes_CompleteEnumeratedType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14803,26 +12371,21 @@ void CompleteEnumeratedTypePubSubType::register_type_object_representation() MinimalEnumeratedTypePubSubType::MinimalEnumeratedTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalEnumeratedType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalEnumeratedType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalEnumeratedType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalEnumeratedTypePubSubType::~MinimalEnumeratedTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14840,12 +12403,10 @@ bool MinimalEnumeratedTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14860,11 +12421,7 @@ bool MinimalEnumeratedTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14881,11 +12438,7 @@ bool MinimalEnumeratedTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14902,52 +12455,43 @@ bool MinimalEnumeratedTypePubSubType::deserialize( return true; } -std::function MinimalEnumeratedTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalEnumeratedTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalEnumeratedTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalEnumeratedTypePubSubType::create_data() { return reinterpret_cast(new MinimalEnumeratedType()); } -void MinimalEnumeratedTypePubSubType::deleteData( +void MinimalEnumeratedTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalEnumeratedTypePubSubType::getKey( +bool MinimalEnumeratedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14955,35 +12499,27 @@ bool MinimalEnumeratedTypePubSubType::getKey( const MinimalEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_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 || eprosima_fastdds_dds_xtypes_MinimalEnumeratedType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14997,26 +12533,21 @@ void MinimalEnumeratedTypePubSubType::register_type_object_representation() CommonBitflagPubSubType::CommonBitflagPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonBitflag"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonBitflag::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonBitflag_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonBitflag"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonBitflag_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitflag_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitflag_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonBitflagPubSubType::~CommonBitflagPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15034,12 +12565,10 @@ bool CommonBitflagPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15054,11 +12583,7 @@ bool CommonBitflagPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15075,11 +12600,7 @@ bool CommonBitflagPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15096,52 +12617,43 @@ bool CommonBitflagPubSubType::deserialize( return true; } -std::function CommonBitflagPubSubType::getSerializedSizeProvider( +uint32_t CommonBitflagPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonBitflagPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonBitflagPubSubType::create_data() { return reinterpret_cast(new CommonBitflag()); } -void CommonBitflagPubSubType::deleteData( +void CommonBitflagPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonBitflagPubSubType::getKey( +bool CommonBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15149,35 +12661,27 @@ bool CommonBitflagPubSubType::getKey( const CommonBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonBitflag_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 || eprosima_fastdds_dds_xtypes_CommonBitflag_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15191,26 +12695,21 @@ void CommonBitflagPubSubType::register_type_object_representation() CompleteBitflagPubSubType::CompleteBitflagPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteBitflag"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteBitflag::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteBitflag_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteBitflag"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteBitflag_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitflag_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitflag_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteBitflagPubSubType::~CompleteBitflagPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15228,12 +12727,10 @@ bool CompleteBitflagPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15248,11 +12745,7 @@ bool CompleteBitflagPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15269,11 +12762,7 @@ bool CompleteBitflagPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15290,52 +12779,43 @@ bool CompleteBitflagPubSubType::deserialize( return true; } -std::function CompleteBitflagPubSubType::getSerializedSizeProvider( +uint32_t CompleteBitflagPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteBitflagPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteBitflagPubSubType::create_data() { return reinterpret_cast(new CompleteBitflag()); } -void CompleteBitflagPubSubType::deleteData( +void CompleteBitflagPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteBitflagPubSubType::getKey( +bool CompleteBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15343,35 +12823,27 @@ bool CompleteBitflagPubSubType::getKey( const CompleteBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteBitflag_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 || eprosima_fastdds_dds_xtypes_CompleteBitflag_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15386,26 +12858,21 @@ void CompleteBitflagPubSubType::register_type_object_representation() MinimalBitflagPubSubType::MinimalBitflagPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalBitflag"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalBitflag::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalBitflag_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalBitflag"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalBitflag_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitflag_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalBitflag_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitflag_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalBitflagPubSubType::~MinimalBitflagPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15423,12 +12890,10 @@ bool MinimalBitflagPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15443,11 +12908,7 @@ bool MinimalBitflagPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15464,11 +12925,7 @@ bool MinimalBitflagPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15485,52 +12942,43 @@ bool MinimalBitflagPubSubType::deserialize( return true; } -std::function MinimalBitflagPubSubType::getSerializedSizeProvider( +uint32_t MinimalBitflagPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalBitflagPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalBitflagPubSubType::create_data() { return reinterpret_cast(new MinimalBitflag()); } -void MinimalBitflagPubSubType::deleteData( +void MinimalBitflagPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalBitflagPubSubType::getKey( +bool MinimalBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15538,35 +12986,27 @@ bool MinimalBitflagPubSubType::getKey( const MinimalBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalBitflag_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 || eprosima_fastdds_dds_xtypes_MinimalBitflag_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15581,26 +13021,21 @@ void MinimalBitflagPubSubType::register_type_object_representation() CommonBitmaskHeaderPubSubType::CommonBitmaskHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonBitmaskHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonBitmaskHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonBitmaskHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonBitmaskHeaderPubSubType::~CommonBitmaskHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15618,12 +13053,10 @@ bool CommonBitmaskHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15638,11 +13071,7 @@ bool CommonBitmaskHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15659,11 +13088,7 @@ bool CommonBitmaskHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15680,52 +13105,43 @@ bool CommonBitmaskHeaderPubSubType::deserialize( return true; } -std::function CommonBitmaskHeaderPubSubType::getSerializedSizeProvider( +uint32_t CommonBitmaskHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonBitmaskHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonBitmaskHeaderPubSubType::create_data() { return reinterpret_cast(new CommonBitmaskHeader()); } -void CommonBitmaskHeaderPubSubType::deleteData( +void CommonBitmaskHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonBitmaskHeaderPubSubType::getKey( +bool CommonBitmaskHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15733,35 +13149,27 @@ bool CommonBitmaskHeaderPubSubType::getKey( const CommonBitmaskHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_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 || eprosima_fastdds_dds_xtypes_CommonBitmaskHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15777,26 +13185,21 @@ void CommonBitmaskHeaderPubSubType::register_type_object_representation() CompleteBitmaskTypePubSubType::CompleteBitmaskTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteBitmaskType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteBitmaskType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteBitmaskType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteBitmaskTypePubSubType::~CompleteBitmaskTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15814,12 +13217,10 @@ bool CompleteBitmaskTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15834,11 +13235,7 @@ bool CompleteBitmaskTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15855,11 +13252,7 @@ bool CompleteBitmaskTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15876,52 +13269,43 @@ bool CompleteBitmaskTypePubSubType::deserialize( return true; } -std::function CompleteBitmaskTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteBitmaskTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteBitmaskTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteBitmaskTypePubSubType::create_data() { return reinterpret_cast(new CompleteBitmaskType()); } -void CompleteBitmaskTypePubSubType::deleteData( +void CompleteBitmaskTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteBitmaskTypePubSubType::getKey( +bool CompleteBitmaskTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15929,35 +13313,27 @@ bool CompleteBitmaskTypePubSubType::getKey( const CompleteBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteBitmaskType_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 || eprosima_fastdds_dds_xtypes_CompleteBitmaskType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15971,26 +13347,21 @@ void CompleteBitmaskTypePubSubType::register_type_object_representation() MinimalBitmaskTypePubSubType::MinimalBitmaskTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalBitmaskType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalBitmaskType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalBitmaskType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalBitmaskTypePubSubType::~MinimalBitmaskTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16008,12 +13379,10 @@ bool MinimalBitmaskTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16028,11 +13397,7 @@ bool MinimalBitmaskTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16049,11 +13414,7 @@ bool MinimalBitmaskTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16070,52 +13431,43 @@ bool MinimalBitmaskTypePubSubType::deserialize( return true; } -std::function MinimalBitmaskTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalBitmaskTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalBitmaskTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalBitmaskTypePubSubType::create_data() { return reinterpret_cast(new MinimalBitmaskType()); } -void MinimalBitmaskTypePubSubType::deleteData( +void MinimalBitmaskTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalBitmaskTypePubSubType::getKey( +bool MinimalBitmaskTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16123,35 +13475,27 @@ bool MinimalBitmaskTypePubSubType::getKey( const MinimalBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalBitmaskType_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 || eprosima_fastdds_dds_xtypes_MinimalBitmaskType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16165,26 +13509,21 @@ void MinimalBitmaskTypePubSubType::register_type_object_representation() CommonBitfieldPubSubType::CommonBitfieldPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CommonBitfield"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CommonBitfield::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CommonBitfield_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CommonBitfield"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CommonBitfield_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CommonBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitfield_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CommonBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CommonBitfield_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CommonBitfieldPubSubType::~CommonBitfieldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16202,12 +13541,10 @@ bool CommonBitfieldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16222,11 +13559,7 @@ bool CommonBitfieldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16243,11 +13576,7 @@ bool CommonBitfieldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16264,52 +13593,43 @@ bool CommonBitfieldPubSubType::deserialize( return true; } -std::function CommonBitfieldPubSubType::getSerializedSizeProvider( +uint32_t CommonBitfieldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CommonBitfieldPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CommonBitfieldPubSubType::create_data() { return reinterpret_cast(new CommonBitfield()); } -void CommonBitfieldPubSubType::deleteData( +void CommonBitfieldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CommonBitfieldPubSubType::getKey( +bool CommonBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16317,35 +13637,27 @@ bool CommonBitfieldPubSubType::getKey( const CommonBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CommonBitfield_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 || eprosima_fastdds_dds_xtypes_CommonBitfield_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16359,26 +13671,21 @@ void CommonBitfieldPubSubType::register_type_object_representation() CompleteBitfieldPubSubType::CompleteBitfieldPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteBitfield"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteBitfield::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteBitfield_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteBitfield"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteBitfield_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitfield_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitfield_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteBitfieldPubSubType::~CompleteBitfieldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16396,12 +13703,10 @@ bool CompleteBitfieldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16416,11 +13721,7 @@ bool CompleteBitfieldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16437,11 +13738,7 @@ bool CompleteBitfieldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16458,52 +13755,43 @@ bool CompleteBitfieldPubSubType::deserialize( return true; } -std::function CompleteBitfieldPubSubType::getSerializedSizeProvider( +uint32_t CompleteBitfieldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteBitfieldPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteBitfieldPubSubType::create_data() { return reinterpret_cast(new CompleteBitfield()); } -void CompleteBitfieldPubSubType::deleteData( +void CompleteBitfieldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteBitfieldPubSubType::getKey( +bool CompleteBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16511,35 +13799,27 @@ bool CompleteBitfieldPubSubType::getKey( const CompleteBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteBitfield_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 || eprosima_fastdds_dds_xtypes_CompleteBitfield_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16554,26 +13834,21 @@ void CompleteBitfieldPubSubType::register_type_object_representation() MinimalBitfieldPubSubType::MinimalBitfieldPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalBitfield"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalBitfield::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalBitfield_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalBitfield"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalBitfield_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitfield_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalBitfield_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitfield_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalBitfieldPubSubType::~MinimalBitfieldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16591,12 +13866,10 @@ bool MinimalBitfieldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16611,11 +13884,7 @@ bool MinimalBitfieldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16632,11 +13901,7 @@ bool MinimalBitfieldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16653,52 +13918,43 @@ bool MinimalBitfieldPubSubType::deserialize( return true; } -std::function MinimalBitfieldPubSubType::getSerializedSizeProvider( +uint32_t MinimalBitfieldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalBitfieldPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalBitfieldPubSubType::create_data() { return reinterpret_cast(new MinimalBitfield()); } -void MinimalBitfieldPubSubType::deleteData( +void MinimalBitfieldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalBitfieldPubSubType::getKey( +bool MinimalBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16706,35 +13962,27 @@ bool MinimalBitfieldPubSubType::getKey( const MinimalBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalBitfield_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 || eprosima_fastdds_dds_xtypes_MinimalBitfield_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16749,26 +13997,21 @@ void MinimalBitfieldPubSubType::register_type_object_representation() CompleteBitsetHeaderPubSubType::CompleteBitsetHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteBitsetHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteBitsetHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteBitsetHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteBitsetHeaderPubSubType::~CompleteBitsetHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16786,12 +14029,10 @@ bool CompleteBitsetHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16806,11 +14047,7 @@ bool CompleteBitsetHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16827,11 +14064,7 @@ bool CompleteBitsetHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16848,52 +14081,43 @@ bool CompleteBitsetHeaderPubSubType::deserialize( return true; } -std::function CompleteBitsetHeaderPubSubType::getSerializedSizeProvider( +uint32_t CompleteBitsetHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteBitsetHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteBitsetHeaderPubSubType::create_data() { return reinterpret_cast(new CompleteBitsetHeader()); } -void CompleteBitsetHeaderPubSubType::deleteData( +void CompleteBitsetHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteBitsetHeaderPubSubType::getKey( +bool CompleteBitsetHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16901,35 +14125,27 @@ bool CompleteBitsetHeaderPubSubType::getKey( const CompleteBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_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 || eprosima_fastdds_dds_xtypes_CompleteBitsetHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16943,26 +14159,21 @@ void CompleteBitsetHeaderPubSubType::register_type_object_representation() MinimalBitsetHeaderPubSubType::MinimalBitsetHeaderPubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalBitsetHeader"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalBitsetHeader::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalBitsetHeader"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalBitsetHeaderPubSubType::~MinimalBitsetHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16980,12 +14191,10 @@ bool MinimalBitsetHeaderPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17000,11 +14209,7 @@ bool MinimalBitsetHeaderPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17021,11 +14226,7 @@ bool MinimalBitsetHeaderPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17042,52 +14243,43 @@ bool MinimalBitsetHeaderPubSubType::deserialize( return true; } -std::function MinimalBitsetHeaderPubSubType::getSerializedSizeProvider( +uint32_t MinimalBitsetHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalBitsetHeaderPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalBitsetHeaderPubSubType::create_data() { return reinterpret_cast(new MinimalBitsetHeader()); } -void MinimalBitsetHeaderPubSubType::deleteData( +void MinimalBitsetHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalBitsetHeaderPubSubType::getKey( +bool MinimalBitsetHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17095,35 +14287,27 @@ bool MinimalBitsetHeaderPubSubType::getKey( const MinimalBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_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 || eprosima_fastdds_dds_xtypes_MinimalBitsetHeader_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17137,26 +14321,21 @@ void MinimalBitsetHeaderPubSubType::register_type_object_representation() CompleteBitsetTypePubSubType::CompleteBitsetTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteBitsetType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteBitsetType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteBitsetType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteBitsetTypePubSubType::~CompleteBitsetTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17174,12 +14353,10 @@ bool CompleteBitsetTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17194,11 +14371,7 @@ bool CompleteBitsetTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17215,11 +14388,7 @@ bool CompleteBitsetTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17236,52 +14405,43 @@ bool CompleteBitsetTypePubSubType::deserialize( return true; } -std::function CompleteBitsetTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteBitsetTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteBitsetTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteBitsetTypePubSubType::create_data() { return reinterpret_cast(new CompleteBitsetType()); } -void CompleteBitsetTypePubSubType::deleteData( +void CompleteBitsetTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteBitsetTypePubSubType::getKey( +bool CompleteBitsetTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17289,35 +14449,27 @@ bool CompleteBitsetTypePubSubType::getKey( const CompleteBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteBitsetType_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 || eprosima_fastdds_dds_xtypes_CompleteBitsetType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17331,26 +14483,21 @@ void CompleteBitsetTypePubSubType::register_type_object_representation() MinimalBitsetTypePubSubType::MinimalBitsetTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalBitsetType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalBitsetType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalBitsetType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalBitsetTypePubSubType::~MinimalBitsetTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17368,12 +14515,10 @@ bool MinimalBitsetTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17388,11 +14533,7 @@ bool MinimalBitsetTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17409,11 +14550,7 @@ bool MinimalBitsetTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17430,52 +14567,43 @@ bool MinimalBitsetTypePubSubType::deserialize( return true; } -std::function MinimalBitsetTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalBitsetTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalBitsetTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalBitsetTypePubSubType::create_data() { return reinterpret_cast(new MinimalBitsetType()); } -void MinimalBitsetTypePubSubType::deleteData( +void MinimalBitsetTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalBitsetTypePubSubType::getKey( +bool MinimalBitsetTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17483,35 +14611,27 @@ bool MinimalBitsetTypePubSubType::getKey( const MinimalBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalBitsetType_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 || eprosima_fastdds_dds_xtypes_MinimalBitsetType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17525,26 +14645,21 @@ void MinimalBitsetTypePubSubType::register_type_object_representation() CompleteExtendedTypePubSubType::CompleteExtendedTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::CompleteExtendedType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CompleteExtendedType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::CompleteExtendedType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CompleteExtendedTypePubSubType::~CompleteExtendedTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17562,12 +14677,10 @@ bool CompleteExtendedTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17582,11 +14695,7 @@ bool CompleteExtendedTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17603,11 +14712,7 @@ bool CompleteExtendedTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17624,52 +14729,43 @@ bool CompleteExtendedTypePubSubType::deserialize( return true; } -std::function CompleteExtendedTypePubSubType::getSerializedSizeProvider( +uint32_t CompleteExtendedTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CompleteExtendedTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CompleteExtendedTypePubSubType::create_data() { return reinterpret_cast(new CompleteExtendedType()); } -void CompleteExtendedTypePubSubType::deleteData( +void CompleteExtendedTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CompleteExtendedTypePubSubType::getKey( +bool CompleteExtendedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17677,35 +14773,27 @@ bool CompleteExtendedTypePubSubType::getKey( const CompleteExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_CompleteExtendedType_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 || eprosima_fastdds_dds_xtypes_CompleteExtendedType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17720,26 +14808,21 @@ void CompleteExtendedTypePubSubType::register_type_object_representation() MinimalExtendedTypePubSubType::MinimalExtendedTypePubSubType() { - setName("eprosima::fastdds::dds::xtypes::MinimalExtendedType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MinimalExtendedType::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::MinimalExtendedType"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MinimalExtendedTypePubSubType::~MinimalExtendedTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17757,12 +14840,10 @@ bool MinimalExtendedTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17777,11 +14858,7 @@ bool MinimalExtendedTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17798,11 +14875,7 @@ bool MinimalExtendedTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17819,52 +14892,43 @@ bool MinimalExtendedTypePubSubType::deserialize( return true; } -std::function MinimalExtendedTypePubSubType::getSerializedSizeProvider( +uint32_t MinimalExtendedTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MinimalExtendedTypePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MinimalExtendedTypePubSubType::create_data() { return reinterpret_cast(new MinimalExtendedType()); } -void MinimalExtendedTypePubSubType::deleteData( +void MinimalExtendedTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MinimalExtendedTypePubSubType::getKey( +bool MinimalExtendedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17872,35 +14936,27 @@ bool MinimalExtendedTypePubSubType::getKey( const MinimalExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_MinimalExtendedType_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 || eprosima_fastdds_dds_xtypes_MinimalExtendedType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17918,26 +14974,21 @@ void MinimalExtendedTypePubSubType::register_type_object_representation() TypeIdentifierTypeObjectPairPubSubType::TypeIdentifierTypeObjectPairPubSubType() { - setName("eprosima::fastdds::dds::xtypes::TypeIdentifierTypeObjectPair"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeIdentifierTypeObjectPair::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::TypeIdentifierTypeObjectPair"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeIdentifierTypeObjectPairPubSubType::~TypeIdentifierTypeObjectPairPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17955,12 +15006,10 @@ bool TypeIdentifierTypeObjectPairPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17975,11 +15024,7 @@ bool TypeIdentifierTypeObjectPairPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17996,11 +15041,7 @@ bool TypeIdentifierTypeObjectPairPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18017,52 +15058,43 @@ bool TypeIdentifierTypeObjectPairPubSubType::deserialize( return true; } -std::function TypeIdentifierTypeObjectPairPubSubType::getSerializedSizeProvider( +uint32_t TypeIdentifierTypeObjectPairPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* TypeIdentifierTypeObjectPairPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* TypeIdentifierTypeObjectPairPubSubType::create_data() { return reinterpret_cast(new TypeIdentifierTypeObjectPair()); } -void TypeIdentifierTypeObjectPairPubSubType::deleteData( +void TypeIdentifierTypeObjectPairPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TypeIdentifierTypeObjectPairPubSubType::getKey( +bool TypeIdentifierTypeObjectPairPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18070,35 +15102,27 @@ bool TypeIdentifierTypeObjectPairPubSubType::getKey( const TypeIdentifierTypeObjectPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_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 || eprosima_fastdds_dds_xtypes_TypeIdentifierTypeObjectPair_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18113,26 +15137,21 @@ void TypeIdentifierTypeObjectPairPubSubType::register_type_object_representation TypeIdentifierPairPubSubType::TypeIdentifierPairPubSubType() { - setName("eprosima::fastdds::dds::xtypes::TypeIdentifierPair"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeIdentifierPair::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::TypeIdentifierPair"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeIdentifierPairPubSubType::~TypeIdentifierPairPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18150,12 +15169,10 @@ bool TypeIdentifierPairPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18170,11 +15187,7 @@ bool TypeIdentifierPairPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18191,11 +15204,7 @@ bool TypeIdentifierPairPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18212,52 +15221,43 @@ bool TypeIdentifierPairPubSubType::deserialize( return true; } -std::function TypeIdentifierPairPubSubType::getSerializedSizeProvider( +uint32_t TypeIdentifierPairPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* TypeIdentifierPairPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* TypeIdentifierPairPubSubType::create_data() { return reinterpret_cast(new TypeIdentifierPair()); } -void TypeIdentifierPairPubSubType::deleteData( +void TypeIdentifierPairPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TypeIdentifierPairPubSubType::getKey( +bool TypeIdentifierPairPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18265,35 +15265,27 @@ bool TypeIdentifierPairPubSubType::getKey( const TypeIdentifierPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_TypeIdentifierPair_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 || eprosima_fastdds_dds_xtypes_TypeIdentifierPair_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18308,26 +15300,21 @@ void TypeIdentifierPairPubSubType::register_type_object_representation() TypeIdentfierWithSizePubSubType::TypeIdentfierWithSizePubSubType() { - setName("eprosima::fastdds::dds::xtypes::TypeIdentfierWithSize"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeIdentfierWithSize::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::TypeIdentfierWithSize"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeIdentfierWithSizePubSubType::~TypeIdentfierWithSizePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18345,12 +15332,10 @@ bool TypeIdentfierWithSizePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18365,11 +15350,7 @@ bool TypeIdentfierWithSizePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18386,11 +15367,7 @@ bool TypeIdentfierWithSizePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18407,52 +15384,43 @@ bool TypeIdentfierWithSizePubSubType::deserialize( return true; } -std::function TypeIdentfierWithSizePubSubType::getSerializedSizeProvider( +uint32_t TypeIdentfierWithSizePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* TypeIdentfierWithSizePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* TypeIdentfierWithSizePubSubType::create_data() { return reinterpret_cast(new TypeIdentfierWithSize()); } -void TypeIdentfierWithSizePubSubType::deleteData( +void TypeIdentfierWithSizePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TypeIdentfierWithSizePubSubType::getKey( +bool TypeIdentfierWithSizePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18460,35 +15428,27 @@ bool TypeIdentfierWithSizePubSubType::getKey( const TypeIdentfierWithSize* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_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 || eprosima_fastdds_dds_xtypes_TypeIdentfierWithSize_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18503,26 +15463,21 @@ void TypeIdentfierWithSizePubSubType::register_type_object_representation() TypeIdentifierWithDependenciesPubSubType::TypeIdentifierWithDependenciesPubSubType() { - setName("eprosima::fastdds::dds::xtypes::TypeIdentifierWithDependencies"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeIdentifierWithDependencies::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::TypeIdentifierWithDependencies"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeIdentifierWithDependenciesPubSubType::~TypeIdentifierWithDependenciesPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18540,12 +15495,10 @@ bool TypeIdentifierWithDependenciesPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18560,11 +15513,7 @@ bool TypeIdentifierWithDependenciesPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18581,11 +15530,7 @@ bool TypeIdentifierWithDependenciesPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18602,52 +15547,43 @@ bool TypeIdentifierWithDependenciesPubSubType::deserialize( return true; } -std::function TypeIdentifierWithDependenciesPubSubType::getSerializedSizeProvider( +uint32_t TypeIdentifierWithDependenciesPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* TypeIdentifierWithDependenciesPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* TypeIdentifierWithDependenciesPubSubType::create_data() { return reinterpret_cast(new TypeIdentifierWithDependencies()); } -void TypeIdentifierWithDependenciesPubSubType::deleteData( +void TypeIdentifierWithDependenciesPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TypeIdentifierWithDependenciesPubSubType::getKey( +bool TypeIdentifierWithDependenciesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18655,35 +15591,27 @@ bool TypeIdentifierWithDependenciesPubSubType::getKey( const TypeIdentifierWithDependencies* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_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 || eprosima_fastdds_dds_xtypes_TypeIdentifierWithDependencies_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18698,26 +15626,21 @@ void TypeIdentifierWithDependenciesPubSubType::register_type_object_representati TypeInformationPubSubType::TypeInformationPubSubType() { - setName("eprosima::fastdds::dds::xtypes::TypeInformation"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TypeInformation::getMaxCdrSerializedSize()); -#else - eprosima_fastdds_dds_xtypes_TypeInformation_max_cdr_typesize; -#endif + set_name("eprosima::fastdds::dds::xtypes::TypeInformation"); + uint32_t type_size = eprosima_fastdds_dds_xtypes_TypeInformation_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_dds_xtypes_TypeInformation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeInformation_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_dds_xtypes_TypeInformation_max_key_cdr_typesize > 16 ? eprosima_fastdds_dds_xtypes_TypeInformation_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TypeInformationPubSubType::~TypeInformationPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18735,12 +15658,10 @@ bool TypeInformationPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18755,11 +15676,7 @@ bool TypeInformationPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18776,11 +15693,7 @@ bool TypeInformationPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18797,52 +15710,43 @@ bool TypeInformationPubSubType::deserialize( return true; } -std::function TypeInformationPubSubType::getSerializedSizeProvider( +uint32_t TypeInformationPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* TypeInformationPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* TypeInformationPubSubType::create_data() { return reinterpret_cast(new TypeInformation()); } -void TypeInformationPubSubType::deleteData( +void TypeInformationPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TypeInformationPubSubType::getKey( +bool TypeInformationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18850,35 +15754,27 @@ bool TypeInformationPubSubType::getKey( const TypeInformation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_dds_xtypes_TypeInformation_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 || eprosima_fastdds_dds_xtypes_TypeInformation_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp index 5188a5562a9..36273a53f0a 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp @@ -575,10 +575,10 @@ bool DomainParticipantImpl::find_or_create_topic_and_type( efd::TopicDescription* topic_desc = lookup_topicdescription(topic_name); if (nullptr != topic_desc) { - if (topic_desc->get_type_name() != type->getName()) + if (topic_desc->get_type_name() != type->get_name()) { EPROSIMA_LOG_ERROR(STATISTICS_DOMAIN_PARTICIPANT, - topic_name << " is not using expected type " << type->getName() << + topic_name << " is not using expected type " << type->get_name() << " and is using instead type " << topic_desc->get_type_name()); return false; } @@ -591,14 +591,14 @@ bool DomainParticipantImpl::find_or_create_topic_and_type( } else { - if (efd::RETCODE_PRECONDITION_NOT_MET == register_type(type, type->getName())) + if (efd::RETCODE_PRECONDITION_NOT_MET == register_type(type, type->get_name())) { // No log because it is already logged within register_type return false; } // Create topic. No need to check return pointer. It fails if the topic already exists, if the QoS is // inconsistent or if the type is not registered. - *topic = create_topic(topic_name, type->getName(), efd::TOPIC_QOS_DEFAULT); + *topic = create_topic(topic_name, type->get_name(), efd::TOPIC_QOS_DEFAULT); } assert(nullptr != *topic); return true; diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp index 4e06d015034..7554573bf32 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp @@ -374,14 +374,14 @@ bool MonitorService::add_change( const bool& disposed) { InstanceHandle_t handle; - type_.getKey(&status_data, &handle, false); + type_.compute_key(&status_data, &handle, false); CacheChange_t* change = status_writer_history_->create_change( (disposed ? fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED : fastdds::rtps::ALIVE), handle); if (nullptr != change) { - uint32_t cdr_size = type_.getSerializedSizeProvider(&status_data, fastdds::dds::DEFAULT_DATA_REPRESENTATION)(); + uint32_t cdr_size = type_.calculate_serialized_size(&status_data, fastdds::dds::DEFAULT_DATA_REPRESENTATION); if (!status_writer_payload_pool_->get_payload(cdr_size, change->serializedPayload)) { status_writer_history_->release_change(change); @@ -440,7 +440,7 @@ bool MonitorService::create_endpoint() watts.endpoint.properties.properties().push_back(std::move(property)); HistoryAttributes hatt; - hatt.payloadMaxSize = type_.m_typeSize; + hatt.payloadMaxSize = type_.max_serialized_type_size; hatt.memoryPolicy = MemoryManagementPolicy_t::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; hatt.initialReservedCaches = 25; hatt.maximumReservedCaches = 0; @@ -460,7 +460,7 @@ bool MonitorService::create_endpoint() status_writer_history_.reset(new eprosima::fastdds::dds::DataWriterHistory( status_writer_payload_pool_, std::make_shared(writer_pool_cfg), - tatt, type_.m_typeSize, + tatt, type_.max_serialized_type_size, MemoryManagementPolicy_t::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, []( const InstanceHandle_t& ) -> void @@ -488,7 +488,7 @@ bool MonitorService::create_endpoint() TopicAttributes tatts; tatts.topicName = MONITOR_SERVICE_TOPIC; - tatts.topicDataType = type_.getName(); + tatts.topicDataType = type_.get_name(); tatts.topicKind = WITH_KEY; endpoint_registrator_(status_writer_, tatts, wqos); diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx index d0e23ab6f51..e44afd7d737 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -36,26 +36,21 @@ namespace eprosima { namespace statistics { ConnectionPubSubType::ConnectionPubSubType() { - setName("eprosima::fastdds::statistics::Connection"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Connection::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Connection_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Connection"); + uint32_t type_size = eprosima_fastdds_statistics_Connection_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Connection_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Connection_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ConnectionPubSubType::~ConnectionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -73,12 +68,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -93,11 +86,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -114,11 +103,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -135,52 +120,43 @@ namespace eprosima { return true; } - std::function ConnectionPubSubType::getSerializedSizeProvider( + uint32_t ConnectionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ConnectionPubSubType::createData() + void* ConnectionPubSubType::create_data() { return reinterpret_cast(new Connection()); } - void ConnectionPubSubType::deleteData( + void ConnectionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ConnectionPubSubType::getKey( + bool ConnectionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -188,35 +164,27 @@ namespace eprosima { const Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Connection_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 || eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -229,26 +197,21 @@ namespace eprosima { QosPolicyCount_sPubSubType::QosPolicyCount_sPubSubType() { - setName("eprosima::fastdds::statistics::QosPolicyCount_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(QosPolicyCount_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_QosPolicyCount_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::QosPolicyCount_s"); + uint32_t type_size = eprosima_fastdds_statistics_QosPolicyCount_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } QosPolicyCount_sPubSubType::~QosPolicyCount_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -266,12 +229,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -286,11 +247,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -307,11 +264,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -328,52 +281,43 @@ namespace eprosima { return true; } - std::function QosPolicyCount_sPubSubType::getSerializedSizeProvider( + uint32_t QosPolicyCount_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* QosPolicyCount_sPubSubType::createData() + void* QosPolicyCount_sPubSubType::create_data() { return reinterpret_cast(new QosPolicyCount_s()); } - void QosPolicyCount_sPubSubType::deleteData( + void QosPolicyCount_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool QosPolicyCount_sPubSubType::getKey( + bool QosPolicyCount_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -381,35 +325,27 @@ namespace eprosima { const QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_QosPolicyCount_s_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 || eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -422,26 +358,21 @@ namespace eprosima { BaseStatus_sPubSubType::BaseStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::BaseStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(BaseStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::BaseStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BaseStatus_sPubSubType::~BaseStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -459,12 +390,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -479,11 +408,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -500,11 +425,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -521,52 +442,43 @@ namespace eprosima { return true; } - std::function BaseStatus_sPubSubType::getSerializedSizeProvider( + uint32_t BaseStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* BaseStatus_sPubSubType::createData() + void* BaseStatus_sPubSubType::create_data() { return reinterpret_cast(new BaseStatus_s()); } - void BaseStatus_sPubSubType::deleteData( + void BaseStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool BaseStatus_sPubSubType::getKey( + bool BaseStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -574,35 +486,27 @@ namespace eprosima { const BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_BaseStatus_s_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 || eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -616,26 +520,21 @@ namespace eprosima { IncompatibleQoSStatus_sPubSubType::IncompatibleQoSStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::IncompatibleQoSStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(IncompatibleQoSStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::IncompatibleQoSStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } IncompatibleQoSStatus_sPubSubType::~IncompatibleQoSStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -653,12 +552,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -673,11 +570,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -694,11 +587,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -715,52 +604,43 @@ namespace eprosima { return true; } - std::function IncompatibleQoSStatus_sPubSubType::getSerializedSizeProvider( + uint32_t IncompatibleQoSStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* IncompatibleQoSStatus_sPubSubType::createData() + void* IncompatibleQoSStatus_sPubSubType::create_data() { return reinterpret_cast(new IncompatibleQoSStatus_s()); } - void IncompatibleQoSStatus_sPubSubType::deleteData( + void IncompatibleQoSStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool IncompatibleQoSStatus_sPubSubType::getKey( + bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -768,35 +648,27 @@ namespace eprosima { const IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_IncompatibleQoSStatus_s_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 || eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -809,26 +681,21 @@ namespace eprosima { LivelinessChangedStatus_sPubSubType::LivelinessChangedStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::LivelinessChangedStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(LivelinessChangedStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::LivelinessChangedStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LivelinessChangedStatus_sPubSubType::~LivelinessChangedStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -846,12 +713,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -866,11 +731,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -887,11 +748,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -908,52 +765,43 @@ namespace eprosima { return true; } - std::function LivelinessChangedStatus_sPubSubType::getSerializedSizeProvider( + uint32_t LivelinessChangedStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* LivelinessChangedStatus_sPubSubType::createData() + void* LivelinessChangedStatus_sPubSubType::create_data() { return reinterpret_cast(new LivelinessChangedStatus_s()); } - void LivelinessChangedStatus_sPubSubType::deleteData( + void LivelinessChangedStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool LivelinessChangedStatus_sPubSubType::getKey( + bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -961,35 +809,27 @@ namespace eprosima { const LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_LivelinessChangedStatus_s_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 || eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1002,26 +842,21 @@ namespace eprosima { DeadlineMissedStatus_sPubSubType::DeadlineMissedStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::DeadlineMissedStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(DeadlineMissedStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::DeadlineMissedStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DeadlineMissedStatus_sPubSubType::~DeadlineMissedStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1039,12 +874,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1059,11 +892,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1080,11 +909,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1101,52 +926,43 @@ namespace eprosima { return true; } - std::function DeadlineMissedStatus_sPubSubType::getSerializedSizeProvider( + uint32_t DeadlineMissedStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* DeadlineMissedStatus_sPubSubType::createData() + void* DeadlineMissedStatus_sPubSubType::create_data() { return reinterpret_cast(new DeadlineMissedStatus_s()); } - void DeadlineMissedStatus_sPubSubType::deleteData( + void DeadlineMissedStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool DeadlineMissedStatus_sPubSubType::getKey( + bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1154,35 +970,27 @@ namespace eprosima { const DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_DeadlineMissedStatus_s_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 || eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1202,26 +1010,21 @@ namespace eprosima { MonitorServiceStatusDataPubSubType::MonitorServiceStatusDataPubSubType() { - setName("eprosima::fastdds::statistics::MonitorServiceStatusData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(MonitorServiceStatusData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_MonitorServiceStatusData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::MonitorServiceStatusData"); + uint32_t type_size = eprosima_fastdds_statistics_MonitorServiceStatusData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MonitorServiceStatusDataPubSubType::~MonitorServiceStatusDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1239,12 +1042,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1259,11 +1060,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1280,11 +1077,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1301,52 +1094,43 @@ namespace eprosima { return true; } - std::function MonitorServiceStatusDataPubSubType::getSerializedSizeProvider( + uint32_t MonitorServiceStatusDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* MonitorServiceStatusDataPubSubType::createData() + void* MonitorServiceStatusDataPubSubType::create_data() { return reinterpret_cast(new MonitorServiceStatusData()); } - void MonitorServiceStatusDataPubSubType::deleteData( + void MonitorServiceStatusDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool MonitorServiceStatusDataPubSubType::getKey( + bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1354,35 +1138,27 @@ namespace eprosima { const MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_MonitorServiceStatusData_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 || eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index 951c853eedf..92123608850 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -68,18 +68,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -114,8 +114,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -142,18 +142,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -188,8 +188,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -216,18 +216,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -262,8 +262,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector QosPolicyCountSeq_s; @@ -291,18 +291,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -337,8 +337,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -365,18 +365,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -411,8 +411,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -439,18 +439,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -485,8 +485,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; @@ -530,18 +530,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -576,8 +576,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace statistics diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index fbc16b14e72..37748c7c06c 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -37,26 +37,21 @@ namespace eprosima { namespace detail { EntityId_sPubSubType::EntityId_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::EntityId_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityId_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_EntityId_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::EntityId_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_EntityId_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityId_sPubSubType::~EntityId_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -74,12 +69,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -94,11 +87,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -115,11 +104,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -136,52 +121,43 @@ namespace eprosima { return true; } - std::function EntityId_sPubSubType::getSerializedSizeProvider( + uint32_t EntityId_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityId_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityId_sPubSubType::create_data() { return reinterpret_cast(new EntityId_s()); } - void EntityId_sPubSubType::deleteData( + void EntityId_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityId_sPubSubType::getKey( + bool EntityId_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -189,35 +165,27 @@ namespace eprosima { const EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_EntityId_s_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 || eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -230,26 +198,21 @@ namespace eprosima { GuidPrefix_sPubSubType::GuidPrefix_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::GuidPrefix_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GuidPrefix_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::GuidPrefix_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GuidPrefix_sPubSubType::~GuidPrefix_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -267,12 +230,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -287,11 +248,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -308,11 +265,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -329,52 +282,43 @@ namespace eprosima { return true; } - std::function GuidPrefix_sPubSubType::getSerializedSizeProvider( + uint32_t GuidPrefix_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GuidPrefix_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GuidPrefix_sPubSubType::create_data() { return reinterpret_cast(new GuidPrefix_s()); } - void GuidPrefix_sPubSubType::deleteData( + void GuidPrefix_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GuidPrefix_sPubSubType::getKey( + bool GuidPrefix_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -382,35 +326,27 @@ namespace eprosima { const GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_GuidPrefix_s_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 || eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -423,26 +359,21 @@ namespace eprosima { GUID_sPubSubType::GUID_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::GUID_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GUID_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_GUID_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::GUID_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_GUID_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GUID_sPubSubType::~GUID_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -460,12 +391,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -480,11 +409,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -501,11 +426,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -522,52 +443,43 @@ namespace eprosima { return true; } - std::function GUID_sPubSubType::getSerializedSizeProvider( + uint32_t GUID_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GUID_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GUID_sPubSubType::create_data() { return reinterpret_cast(new GUID_s()); } - void GUID_sPubSubType::deleteData( + void GUID_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GUID_sPubSubType::getKey( + bool GUID_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -575,35 +487,27 @@ namespace eprosima { const GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_GUID_s_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 || eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -616,26 +520,21 @@ namespace eprosima { SequenceNumber_sPubSubType::SequenceNumber_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::SequenceNumber_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceNumber_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_SequenceNumber_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::SequenceNumber_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceNumber_sPubSubType::~SequenceNumber_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -653,12 +552,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -673,11 +570,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -694,11 +587,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -715,52 +604,43 @@ namespace eprosima { return true; } - std::function SequenceNumber_sPubSubType::getSerializedSizeProvider( + uint32_t SequenceNumber_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SequenceNumber_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SequenceNumber_sPubSubType::create_data() { return reinterpret_cast(new SequenceNumber_s()); } - void SequenceNumber_sPubSubType::deleteData( + void SequenceNumber_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SequenceNumber_sPubSubType::getKey( + bool SequenceNumber_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -768,35 +648,27 @@ namespace eprosima { const SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_SequenceNumber_s_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 || eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -809,26 +681,21 @@ namespace eprosima { SampleIdentity_sPubSubType::SampleIdentity_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::SampleIdentity_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SampleIdentity_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_SampleIdentity_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::SampleIdentity_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SampleIdentity_sPubSubType::~SampleIdentity_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -846,12 +713,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -866,11 +731,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -887,11 +748,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -908,52 +765,43 @@ namespace eprosima { return true; } - std::function SampleIdentity_sPubSubType::getSerializedSizeProvider( + uint32_t SampleIdentity_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SampleIdentity_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SampleIdentity_sPubSubType::create_data() { return reinterpret_cast(new SampleIdentity_s()); } - void SampleIdentity_sPubSubType::deleteData( + void SampleIdentity_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SampleIdentity_sPubSubType::getKey( + bool SampleIdentity_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -961,35 +809,27 @@ namespace eprosima { const SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_SampleIdentity_s_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 || eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1002,26 +842,21 @@ namespace eprosima { Locator_sPubSubType::Locator_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::Locator_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Locator_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::Locator_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Locator_sPubSubType::~Locator_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1039,12 +874,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1059,11 +892,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1080,11 +909,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1101,52 +926,43 @@ namespace eprosima { return true; } - std::function Locator_sPubSubType::getSerializedSizeProvider( + uint32_t Locator_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Locator_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Locator_sPubSubType::create_data() { return reinterpret_cast(new Locator_s()); } - void Locator_sPubSubType::deleteData( + void Locator_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Locator_sPubSubType::getKey( + bool Locator_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1154,35 +970,27 @@ namespace eprosima { const Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_Locator_s_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 || eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1197,26 +1005,21 @@ namespace eprosima { DiscoveryTimePubSubType::DiscoveryTimePubSubType() { - setName("eprosima::fastdds::statistics::DiscoveryTime"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(DiscoveryTime::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::DiscoveryTime"); + uint32_t type_size = eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DiscoveryTimePubSubType::~DiscoveryTimePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1234,12 +1037,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1254,11 +1055,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1275,11 +1072,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1296,52 +1089,43 @@ namespace eprosima { return true; } - std::function DiscoveryTimePubSubType::getSerializedSizeProvider( + uint32_t DiscoveryTimePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* DiscoveryTimePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* DiscoveryTimePubSubType::create_data() { return reinterpret_cast(new DiscoveryTime()); } - void DiscoveryTimePubSubType::deleteData( + void DiscoveryTimePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool DiscoveryTimePubSubType::getKey( + bool DiscoveryTimePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1349,35 +1133,27 @@ namespace eprosima { const DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_DiscoveryTime_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 || eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1390,26 +1166,21 @@ namespace eprosima { EntityCountPubSubType::EntityCountPubSubType() { - setName("eprosima::fastdds::statistics::EntityCount"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityCount::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_EntityCount_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::EntityCount"); + uint32_t type_size = eprosima_fastdds_statistics_EntityCount_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityCountPubSubType::~EntityCountPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1427,12 +1198,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1447,11 +1216,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1468,11 +1233,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1489,52 +1250,43 @@ namespace eprosima { return true; } - std::function EntityCountPubSubType::getSerializedSizeProvider( + uint32_t EntityCountPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityCountPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityCountPubSubType::create_data() { return reinterpret_cast(new EntityCount()); } - void EntityCountPubSubType::deleteData( + void EntityCountPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityCountPubSubType::getKey( + bool EntityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1542,35 +1294,27 @@ namespace eprosima { const EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_EntityCount_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 || eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1583,26 +1327,21 @@ namespace eprosima { SampleIdentityCountPubSubType::SampleIdentityCountPubSubType() { - setName("eprosima::fastdds::statistics::SampleIdentityCount"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SampleIdentityCount::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_SampleIdentityCount_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::SampleIdentityCount"); + uint32_t type_size = eprosima_fastdds_statistics_SampleIdentityCount_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SampleIdentityCountPubSubType::~SampleIdentityCountPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1620,12 +1359,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1640,11 +1377,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1661,11 +1394,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1682,52 +1411,43 @@ namespace eprosima { return true; } - std::function SampleIdentityCountPubSubType::getSerializedSizeProvider( + uint32_t SampleIdentityCountPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SampleIdentityCountPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SampleIdentityCountPubSubType::create_data() { return reinterpret_cast(new SampleIdentityCount()); } - void SampleIdentityCountPubSubType::deleteData( + void SampleIdentityCountPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SampleIdentityCountPubSubType::getKey( + bool SampleIdentityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1735,35 +1455,27 @@ namespace eprosima { const SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_SampleIdentityCount_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 || eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1776,26 +1488,21 @@ namespace eprosima { Entity2LocatorTrafficPubSubType::Entity2LocatorTrafficPubSubType() { - setName("eprosima::fastdds::statistics::Entity2LocatorTraffic"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Entity2LocatorTraffic::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Entity2LocatorTraffic_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Entity2LocatorTraffic"); + uint32_t type_size = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Entity2LocatorTrafficPubSubType::~Entity2LocatorTrafficPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1813,12 +1520,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1833,11 +1538,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1854,11 +1555,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1875,52 +1572,43 @@ namespace eprosima { return true; } - std::function Entity2LocatorTrafficPubSubType::getSerializedSizeProvider( + uint32_t Entity2LocatorTrafficPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Entity2LocatorTrafficPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Entity2LocatorTrafficPubSubType::create_data() { return reinterpret_cast(new Entity2LocatorTraffic()); } - void Entity2LocatorTrafficPubSubType::deleteData( + void Entity2LocatorTrafficPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Entity2LocatorTrafficPubSubType::getKey( + bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1928,35 +1616,27 @@ namespace eprosima { const Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Entity2LocatorTraffic_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 || eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1969,26 +1649,21 @@ namespace eprosima { WriterReaderDataPubSubType::WriterReaderDataPubSubType() { - setName("eprosima::fastdds::statistics::WriterReaderData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(WriterReaderData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_WriterReaderData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::WriterReaderData"); + uint32_t type_size = eprosima_fastdds_statistics_WriterReaderData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } WriterReaderDataPubSubType::~WriterReaderDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2006,12 +1681,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2026,11 +1699,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2047,11 +1716,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2068,52 +1733,43 @@ namespace eprosima { return true; } - std::function WriterReaderDataPubSubType::getSerializedSizeProvider( + uint32_t WriterReaderDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* WriterReaderDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* WriterReaderDataPubSubType::create_data() { return reinterpret_cast(new WriterReaderData()); } - void WriterReaderDataPubSubType::deleteData( + void WriterReaderDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool WriterReaderDataPubSubType::getKey( + bool WriterReaderDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2121,35 +1777,27 @@ namespace eprosima { const WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_WriterReaderData_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 || eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2162,26 +1810,21 @@ namespace eprosima { Locator2LocatorDataPubSubType::Locator2LocatorDataPubSubType() { - setName("eprosima::fastdds::statistics::Locator2LocatorData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Locator2LocatorData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Locator2LocatorData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Locator2LocatorData"); + uint32_t type_size = eprosima_fastdds_statistics_Locator2LocatorData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Locator2LocatorDataPubSubType::~Locator2LocatorDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2199,12 +1842,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2219,11 +1860,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2240,11 +1877,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2261,52 +1894,43 @@ namespace eprosima { return true; } - std::function Locator2LocatorDataPubSubType::getSerializedSizeProvider( + uint32_t Locator2LocatorDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Locator2LocatorDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Locator2LocatorDataPubSubType::create_data() { return reinterpret_cast(new Locator2LocatorData()); } - void Locator2LocatorDataPubSubType::deleteData( + void Locator2LocatorDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Locator2LocatorDataPubSubType::getKey( + bool Locator2LocatorDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2314,35 +1938,27 @@ namespace eprosima { const Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Locator2LocatorData_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 || eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2355,26 +1971,21 @@ namespace eprosima { EntityDataPubSubType::EntityDataPubSubType() { - setName("eprosima::fastdds::statistics::EntityData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_EntityData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::EntityData"); + uint32_t type_size = eprosima_fastdds_statistics_EntityData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityDataPubSubType::~EntityDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2392,12 +2003,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2412,11 +2021,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2433,11 +2038,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2454,52 +2055,43 @@ namespace eprosima { return true; } - std::function EntityDataPubSubType::getSerializedSizeProvider( + uint32_t EntityDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityDataPubSubType::create_data() { return reinterpret_cast(new EntityData()); } - void EntityDataPubSubType::deleteData( + void EntityDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityDataPubSubType::getKey( + bool EntityDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2507,35 +2099,27 @@ namespace eprosima { const EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_EntityData_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 || eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2548,26 +2132,21 @@ namespace eprosima { PhysicalDataPubSubType::PhysicalDataPubSubType() { - setName("eprosima::fastdds::statistics::PhysicalData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(PhysicalData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::PhysicalData"); + uint32_t type_size = eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PhysicalDataPubSubType::~PhysicalDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2585,12 +2164,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2605,11 +2182,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2626,11 +2199,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2647,52 +2216,43 @@ namespace eprosima { return true; } - std::function PhysicalDataPubSubType::getSerializedSizeProvider( + uint32_t PhysicalDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* PhysicalDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* PhysicalDataPubSubType::create_data() { return reinterpret_cast(new PhysicalData()); } - void PhysicalDataPubSubType::deleteData( + void PhysicalDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool PhysicalDataPubSubType::getKey( + bool PhysicalDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2700,35 +2260,27 @@ namespace eprosima { const PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_PhysicalData_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 || eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index 77c37085ca3..bec7ad3b50b 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -69,18 +69,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -115,8 +115,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,18 +143,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -189,8 +189,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -217,18 +217,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -263,8 +263,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -291,18 +291,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -337,8 +337,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -365,18 +365,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -411,8 +411,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -439,18 +439,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -485,8 +485,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace detail @@ -514,18 +514,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -560,8 +560,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -588,18 +588,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -634,8 +634,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -662,18 +662,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -708,8 +708,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -736,18 +736,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -782,8 +782,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -810,18 +810,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -856,8 +856,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -884,18 +884,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -930,8 +930,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -958,18 +958,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1004,8 +1004,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1032,18 +1032,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1078,8 +1078,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace EventKind diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp index ab968fef730..f3ecd2d63d0 100644 --- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp +++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp @@ -345,7 +345,7 @@ class PubSubParticipant if (topic == nullptr) { topic = participant_->create_topic(publisher_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); } if (topic) { @@ -382,7 +382,7 @@ class PubSubParticipant if (topic == nullptr) { topic = participant_->create_topic(subscriber_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); } if (topic) { diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp index 4daac8e5097..9c3c361f416 100644 --- a/test/blackbox/api/dds-pim/PubSubReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubReader.hpp @@ -445,7 +445,7 @@ class PubSubReader // Create topic topic_ = - participant_->create_topic(topic_name_, type_->getName(), + participant_->create_topic(topic_name_, type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(topic_, nullptr); ASSERT_TRUE(topic_->is_enabled()); diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp index 8b8d75632d9..230369965ff 100644 --- a/test/blackbox/api/dds-pim/PubSubWriter.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriter.hpp @@ -407,7 +407,7 @@ class PubSubWriter ASSERT_EQ(participant_->register_type(type_), eprosima::fastdds::dds::RETCODE_OK); // Create topic - topic_ = participant_->create_topic(topic_name_, type_->getName(), + topic_ = participant_->create_topic(topic_name_, type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(topic_, nullptr); ASSERT_TRUE(topic_->is_enabled()); diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp index 3f5da3a8750..57f8a58d5ed 100644 --- a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp @@ -413,7 +413,7 @@ class PubSubWriterReader // Create topic topic_ = - participant_->create_topic(topic_name_, type_->getName(), + participant_->create_topic(topic_name_, type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(topic_, nullptr); ASSERT_TRUE(topic_->is_enabled()); @@ -449,7 +449,7 @@ class PubSubWriterReader { topic_name += suffix; eprosima::fastdds::dds::Topic* topic = participant_->create_topic(topic_name, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ret_val &= (nullptr != topic); if (!ret_val) { diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp index 2b4689ce462..e2af5fe150d 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp @@ -101,13 +101,13 @@ void ReqRepHelloWorldReplier::init() configDatareader("Request"); request_topic_ = participant_->create_topic(datareader_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(request_topic_, nullptr); ASSERT_TRUE(request_topic_->is_enabled()); configDatawriter("Reply"); reply_topic_ = participant_->create_topic(datawriter_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(reply_topic_, nullptr); ASSERT_TRUE(reply_topic_->is_enabled()); diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp index 359bac358ce..c055db9db22 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp @@ -106,13 +106,13 @@ void ReqRepHelloWorldRequester::init() configDatareader("Reply"); reply_topic_ = participant_->create_topic(datareader_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(reply_topic_, nullptr); ASSERT_TRUE(reply_topic_->is_enabled()); configDatawriter("Request"); request_topic_ = participant_->create_topic(datawriter_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(request_topic_, nullptr); ASSERT_TRUE(request_topic_->is_enabled()); diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp index eb9b91f60a8..9699b2f09c3 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp @@ -146,13 +146,13 @@ void TCPReqRepHelloWorldReplier::init( configDatareader("Request"); request_topic_ = participant_->create_topic(datareader_topicname_, - type_->getName(), TOPIC_QOS_DEFAULT); + type_->get_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(request_topic_, nullptr); ASSERT_TRUE(request_topic_->is_enabled()); configDatawriter("Reply"); reply_topic_ = participant_->create_topic(datawriter_topicname_, - type_->getName(), TOPIC_QOS_DEFAULT); + type_->get_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(reply_topic_, nullptr); ASSERT_TRUE(reply_topic_->is_enabled()); diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp index 47fb1274a77..00aab3af949 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp @@ -200,13 +200,13 @@ void TCPReqRepHelloWorldRequester::init( configDatareader("Reply"); reply_topic_ = participant_->create_topic(datareader_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(reply_topic_, nullptr); ASSERT_TRUE(reply_topic_->is_enabled()); configDatawriter("Request"); request_topic_ = participant_->create_topic(datawriter_topicname_, - type_->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + type_->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(request_topic_, nullptr); ASSERT_TRUE(request_topic_->is_enabled()); diff --git a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp index 1ffcd52eb60..53eb5690a9f 100644 --- a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp +++ b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp @@ -608,7 +608,7 @@ TEST(DDSContentFilter, CorrectlyHandleAliasOtherHeader) throw std::runtime_error("Failed to create subscriber"); } - auto topic = participant->create_topic("TestTopic", type->getName(), TOPIC_QOS_DEFAULT); + auto topic = participant->create_topic("TestTopic", type->get_name(), TOPIC_QOS_DEFAULT); if (topic == nullptr) { throw std::runtime_error("Failed to create topic"); diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp index 0a7b1d0fad6..b0ddc6ad7a5 100644 --- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp @@ -1746,7 +1746,7 @@ static void test_DDSDiscovery_WaitSetMatchedStatus( fastdds::dds::TypeSupport type(new HelloWorldPubSubType()); EXPECT_EQ(type.register_type(participant), eprosima::fastdds::dds::RETCODE_OK); - auto topic = participant->create_topic(TEST_TOPIC_NAME, type->getName(), fastdds::dds::TOPIC_QOS_DEFAULT); + auto topic = participant->create_topic(TEST_TOPIC_NAME, type->get_name(), fastdds::dds::TOPIC_QOS_DEFAULT); ASSERT_NE(topic, nullptr); auto publisher = participant->create_publisher(fastdds::dds::PUBLISHER_QOS_DEFAULT); diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index c5cdc31a79c..73736d7150d 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -53,8 +53,8 @@ class DDSFindTopicTest : public testing::Test TestType() : TopicDataType() { - m_isGetKeyDefined = false; - m_typeSize = 16; + is_compute_key_provided = false; + max_serialized_type_size = 16; } bool serialize( @@ -72,24 +72,24 @@ class DDSFindTopicTest : public testing::Test return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const, fastdds::dds::DataRepresentationId_t) override { - return {}; + return 0u; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void*) override { } - bool getKey( + bool compute_key( const void* const, fastdds::rtps::InstanceHandle_t*, bool) override @@ -99,7 +99,7 @@ class DDSFindTopicTest : public testing::Test private: - using TopicDataType::getSerializedSizeProvider; + using TopicDataType::calculate_serialized_size; using TopicDataType::serialize; }; @@ -114,7 +114,7 @@ class DDSFindTopicTest : public testing::Test ASSERT_NE(nullptr, participant_); type_.reset(new TestType); - type_->setName(c_type_name); + type_->set_name(c_type_name); participant_->register_type(type_); } diff --git a/test/blackbox/common/DDSBlackboxTestsListeners.cpp b/test/blackbox/common/DDSBlackboxTestsListeners.cpp index 8fad1df288f..54227839abf 100644 --- a/test/blackbox/common/DDSBlackboxTestsListeners.cpp +++ b/test/blackbox/common/DDSBlackboxTestsListeners.cpp @@ -3087,8 +3087,8 @@ TEST(DDSStatus, keyed_best_effort_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle_odd; eprosima::fastdds::dds::InstanceHandle_t handle_even; - dummy_data->getKey(&data.front(), &handle_even); - dummy_data->getKey(&data.back(), &handle_odd); + dummy_data->compute_key(&data.front(), &handle_even); + dummy_data->compute_key(&data.back(), &handle_odd); reader.startReception(data); writer.send(data); @@ -3218,7 +3218,7 @@ TEST(DDSStatus, keyed_reliable_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle; - dummy_data->getKey(&data.back(), &handle); + dummy_data->compute_key(&data.back(), &handle); reader.startReception(data); // To avoid race condition receiving ACK, wait some time between samples @@ -3401,8 +3401,8 @@ TEST(DDSStatus, keyed_reliable_positive_acks_disabled_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle_odd; eprosima::fastdds::dds::InstanceHandle_t handle_even; - dummy_data->getKey(&data.front(), &handle_even); - dummy_data->getKey(&data.back(), &handle_odd); + dummy_data->compute_key(&data.front(), &handle_even); + dummy_data->compute_key(&data.back(), &handle_odd); reader.startReception(data); diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp index 8c54ac9b006..841aa8255c9 100644 --- a/test/blackbox/common/RTPSAsSocketReader.hpp +++ b/test/blackbox/common/RTPSAsSocketReader.hpp @@ -148,7 +148,7 @@ class RTPSAsSocketReader ASSERT_NE(participant_, nullptr); //Create readerhistory - hattr_.payloadMaxSize = 255 + type_.m_typeSize; + hattr_.payloadMaxSize = 255 + type_.max_serialized_type_size; history_ = new eprosima::fastdds::rtps::ReaderHistory(hattr_); ASSERT_NE(history_, nullptr); diff --git a/test/blackbox/common/RTPSAsSocketWriter.hpp b/test/blackbox/common/RTPSAsSocketWriter.hpp index 498478cc9e1..88dd861a11d 100644 --- a/test/blackbox/common/RTPSAsSocketWriter.hpp +++ b/test/blackbox/common/RTPSAsSocketWriter.hpp @@ -110,7 +110,7 @@ class RTPSAsSocketWriter : public eprosima::fastdds::rtps::WriterListener ASSERT_NE(participant_, nullptr); //Create writerhistory - hattr_.payloadMaxSize = 255 + type_.m_typeSize; + hattr_.payloadMaxSize = 255 + type_.max_serialized_type_size; history_ = new eprosima::fastdds::rtps::WriterHistory(hattr_); //Create writer diff --git a/test/blackbox/common/RTPSBlackboxTestsPools.cpp b/test/blackbox/common/RTPSBlackboxTestsPools.cpp index c5f74f6f2c0..b7a501e07e7 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPools.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPools.cpp @@ -236,7 +236,7 @@ void do_test( TType type_support; uint32_t num_samples = static_cast(data.size()); uint32_t num_endpoints = (uint32_t)pool_on_reader + (uint32_t)pool_on_writer; - uint32_t payload_size = static_cast(type_support.m_typeSize); + uint32_t payload_size = static_cast(type_support.max_serialized_type_size); payload_size += static_cast(eprosima::fastcdr::Cdr::alignment(payload_size, 4)); /* possible submessage alignment */ payload_size += 4u; // encapsulation header diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp index 7a8ddc552f7..59c4f5553ca 100644 --- a/test/blackbox/common/RTPSWithRegistrationReader.hpp +++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp @@ -140,7 +140,7 @@ class RTPSWithRegistrationReader , receiving_(false) , matched_(0) { - topic_attr_.topicDataType = type_.getName(); + topic_attr_.topicDataType = type_.get_name(); // Generate topic name std::ostringstream t; t << topic_name << "_" << asio::ip::host_name() << "_" << GET_PID(); @@ -172,7 +172,7 @@ class RTPSWithRegistrationReader } //Create readerhistory - hattr_.payloadMaxSize = type_.m_typeSize; + hattr_.payloadMaxSize = type_.max_serialized_type_size; history_ = new eprosima::fastdds::rtps::ReaderHistory(hattr_); ASSERT_NE(history_, nullptr); diff --git a/test/blackbox/common/RTPSWithRegistrationWriter.hpp b/test/blackbox/common/RTPSWithRegistrationWriter.hpp index 3bf71564e22..c926b5067ef 100644 --- a/test/blackbox/common/RTPSWithRegistrationWriter.hpp +++ b/test/blackbox/common/RTPSWithRegistrationWriter.hpp @@ -124,7 +124,7 @@ class RTPSWithRegistrationWriter , initialized_(false) , matched_(0) { - topic_attr_.topicDataType = type_.getName(); + topic_attr_.topicDataType = type_.get_name(); // Generate topic name std::ostringstream t; t << topic_name << "_" << asio::ip::host_name() << "_" << GET_PID(); @@ -159,7 +159,7 @@ class RTPSWithRegistrationWriter ASSERT_NE(participant_, nullptr); //Create writerhistory - hattr_.payloadMaxSize = type_.m_typeSize; + hattr_.payloadMaxSize = type_.max_serialized_type_size; if (has_payload_pool_) { history_ = new eprosima::fastdds::rtps::WriterHistory(hattr_, payload_pool_); diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx index 3bda0762448..e1e701d2bde 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.cxx +++ b/test/blackbox/types/Data1mbPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; Data1mbPubSubType::Data1mbPubSubType() { - setName("Data1mb"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Data1mb::getMaxCdrSerializedSize()); -#else - Data1mb_max_cdr_typesize; -#endif + set_name("Data1mb"); + uint32_t type_size = Data1mb_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Data1mb_max_key_cdr_typesize > 16 ? Data1mb_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Data1mb_max_key_cdr_typesize > 16 ? Data1mb_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Data1mbPubSubType::~Data1mbPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool Data1mbPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool Data1mbPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool Data1mbPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool Data1mbPubSubType::deserialize( return true; } -std::function Data1mbPubSubType::getSerializedSizeProvider( +uint32_t Data1mbPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* Data1mbPubSubType::createData() +void* Data1mbPubSubType::create_data() { return reinterpret_cast(new Data1mb()); } -void Data1mbPubSubType::deleteData( +void Data1mbPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Data1mbPubSubType::getKey( +bool Data1mbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool Data1mbPubSubType::getKey( const Data1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Data1mb_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 || Data1mb_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index cb5559fd55b..932ca265e21 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -61,18 +61,18 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx index 90a08fd6a58..d4fcd33ae4f 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.cxx +++ b/test/blackbox/types/Data64kbPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; Data64kbPubSubType::Data64kbPubSubType() { - setName("Data64kb"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Data64kb::getMaxCdrSerializedSize()); -#else - Data64kb_max_cdr_typesize; -#endif + set_name("Data64kb"); + uint32_t type_size = Data64kb_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Data64kb_max_key_cdr_typesize > 16 ? Data64kb_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Data64kb_max_key_cdr_typesize > 16 ? Data64kb_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Data64kbPubSubType::~Data64kbPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool Data64kbPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool Data64kbPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool Data64kbPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool Data64kbPubSubType::deserialize( return true; } -std::function Data64kbPubSubType::getSerializedSizeProvider( +uint32_t Data64kbPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* Data64kbPubSubType::createData() +void* Data64kbPubSubType::create_data() { return reinterpret_cast(new Data64kb()); } -void Data64kbPubSubType::deleteData( +void Data64kbPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Data64kbPubSubType::getKey( +bool Data64kbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool Data64kbPubSubType::getKey( const Data64kb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Data64kb_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 || Data64kb_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index c4843c4f5a0..0c6697bbbc3 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -61,18 +61,18 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx index 545a7a8d600..15598089295 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.cxx +++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FixedSizedPubSubType::FixedSizedPubSubType() { - setName("FixedSized"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixedSized::getMaxCdrSerializedSize()); -#else - FixedSized_max_cdr_typesize; -#endif + set_name("FixedSized"); + uint32_t type_size = FixedSized_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixedSized_max_key_cdr_typesize > 16 ? FixedSized_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixedSized_max_key_cdr_typesize > 16 ? FixedSized_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixedSizedPubSubType::~FixedSizedPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool FixedSizedPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool FixedSizedPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool FixedSizedPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool FixedSizedPubSubType::deserialize( return true; } -std::function FixedSizedPubSubType::getSerializedSizeProvider( +uint32_t FixedSizedPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* FixedSizedPubSubType::createData() +void* FixedSizedPubSubType::create_data() { return reinterpret_cast(new FixedSized()); } -void FixedSizedPubSubType::deleteData( +void FixedSizedPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixedSizedPubSubType::getKey( +bool FixedSizedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool FixedSizedPubSubType::getKey( const FixedSized* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixedSized_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 || FixedSized_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index b79f6098cf9..f40a57fdfd5 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -94,18 +94,18 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -146,8 +146,8 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx index fcd07be724a..fbfc59189f0 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() { - setName("HelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(HelloWorld::getMaxCdrSerializedSize()); -#else - HelloWorld_max_cdr_typesize; -#endif + set_name("HelloWorld"); + uint32_t type_size = HelloWorld_max_cdr_typesize; type_size += static_cast(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(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = HelloWorld_max_key_cdr_typesize > 16 ? HelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HelloWorldPubSubType::~HelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool HelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool HelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool HelloWorldPubSubType::deserialize( return true; } -std::function HelloWorldPubSubType::getSerializedSizeProvider( +uint32_t HelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* HelloWorldPubSubType::createData() +void* HelloWorldPubSubType::create_data() { return reinterpret_cast(new HelloWorld()); } -void HelloWorldPubSubType::deleteData( +void HelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool HelloWorldPubSubType::getKey( +bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool HelloWorldPubSubType::getKey( const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), 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(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index a22a6f25267..4fe2ea7a1ce 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx index 23aa6e4a424..978cb74e3ff 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedData1mbPubSubType::KeyedData1mbPubSubType() { - setName("KeyedData1mb"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedData1mb::getMaxCdrSerializedSize()); -#else - KeyedData1mb_max_cdr_typesize; -#endif + set_name("KeyedData1mb"); + uint32_t type_size = KeyedData1mb_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedData1mb_max_key_cdr_typesize > 16 ? KeyedData1mb_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedData1mb_max_key_cdr_typesize > 16 ? KeyedData1mb_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedData1mbPubSubType::~KeyedData1mbPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool KeyedData1mbPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool KeyedData1mbPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool KeyedData1mbPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool KeyedData1mbPubSubType::deserialize( return true; } -std::function KeyedData1mbPubSubType::getSerializedSizeProvider( +uint32_t KeyedData1mbPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* KeyedData1mbPubSubType::createData() +void* KeyedData1mbPubSubType::create_data() { return reinterpret_cast(new KeyedData1mb()); } -void KeyedData1mbPubSubType::deleteData( +void KeyedData1mbPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedData1mbPubSubType::getKey( +bool KeyedData1mbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool KeyedData1mbPubSubType::getKey( const KeyedData1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedData1mb_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 || KeyedData1mb_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index 8a46c5b1526..82b9e3d87f9 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -61,18 +61,18 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx index 990b0adbca3..b5e6fb9a45b 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedHelloWorldPubSubType::KeyedHelloWorldPubSubType() { - setName("KeyedHelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedHelloWorld::getMaxCdrSerializedSize()); -#else - KeyedHelloWorld_max_cdr_typesize; -#endif + set_name("KeyedHelloWorld"); + uint32_t type_size = KeyedHelloWorld_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedHelloWorld_max_key_cdr_typesize > 16 ? KeyedHelloWorld_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedHelloWorld_max_key_cdr_typesize > 16 ? KeyedHelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedHelloWorldPubSubType::~KeyedHelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool KeyedHelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool KeyedHelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool KeyedHelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool KeyedHelloWorldPubSubType::deserialize( return true; } -std::function KeyedHelloWorldPubSubType::getSerializedSizeProvider( +uint32_t KeyedHelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* KeyedHelloWorldPubSubType::createData() +void* KeyedHelloWorldPubSubType::create_data() { return reinterpret_cast(new KeyedHelloWorld()); } -void KeyedHelloWorldPubSubType::deleteData( +void KeyedHelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedHelloWorldPubSubType::getKey( +bool KeyedHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool KeyedHelloWorldPubSubType::getKey( const KeyedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedHelloWorld_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 || KeyedHelloWorld_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index 01321b923f9..64813545798 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx index f27379cc665..51eed1aede4 100644 --- a/test/blackbox/types/StringTestPubSubTypes.cxx +++ b/test/blackbox/types/StringTestPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StringTestPubSubType::StringTestPubSubType() { - setName("StringTest"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StringTest::getMaxCdrSerializedSize()); -#else - StringTest_max_cdr_typesize; -#endif + set_name("StringTest"); + uint32_t type_size = StringTest_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StringTest_max_key_cdr_typesize > 16 ? StringTest_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StringTest_max_key_cdr_typesize > 16 ? StringTest_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StringTestPubSubType::~StringTestPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool StringTestPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool StringTestPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool StringTestPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool StringTestPubSubType::deserialize( return true; } -std::function StringTestPubSubType::getSerializedSizeProvider( +uint32_t StringTestPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* StringTestPubSubType::createData() +void* StringTestPubSubType::create_data() { return reinterpret_cast(new StringTest()); } -void StringTestPubSubType::deleteData( +void StringTestPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StringTestPubSubType::getKey( +bool StringTestPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool StringTestPubSubType::getKey( const StringTest* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StringTest_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 || StringTest_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index a0ba72312ec..4603505d065 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -61,18 +61,18 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx index e62e4d81c84..1d04f3a65e2 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx +++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; TestRegression3361PubSubType::TestRegression3361PubSubType() { - setName("TestRegression3361"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(TestRegression3361::getMaxCdrSerializedSize()); -#else - TestRegression3361_max_cdr_typesize; -#endif + set_name("TestRegression3361"); + uint32_t type_size = TestRegression3361_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = TestRegression3361_max_key_cdr_typesize > 16 ? TestRegression3361_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = TestRegression3361_max_key_cdr_typesize > 16 ? TestRegression3361_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } TestRegression3361PubSubType::~TestRegression3361PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool TestRegression3361PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool TestRegression3361PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool TestRegression3361PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool TestRegression3361PubSubType::deserialize( return true; } -std::function TestRegression3361PubSubType::getSerializedSizeProvider( +uint32_t TestRegression3361PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* TestRegression3361PubSubType::createData() +void* TestRegression3361PubSubType::create_data() { return reinterpret_cast(new TestRegression3361()); } -void TestRegression3361PubSubType::deleteData( +void TestRegression3361PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool TestRegression3361PubSubType::getKey( +bool TestRegression3361PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool TestRegression3361PubSubType::getKey( const TestRegression3361* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), TestRegression3361_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 || TestRegression3361_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index 162fbdd89d1..41d62c61b6f 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -62,18 +62,18 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx index 0aa09725928..ffbc44c1c80 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; UnboundedHelloWorldPubSubType::UnboundedHelloWorldPubSubType() { - setName("UnboundedHelloWorld"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnboundedHelloWorld::getMaxCdrSerializedSize()); -#else - UnboundedHelloWorld_max_cdr_typesize; -#endif + set_name("UnboundedHelloWorld"); + uint32_t type_size = UnboundedHelloWorld_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnboundedHelloWorld_max_key_cdr_typesize > 16 ? UnboundedHelloWorld_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnboundedHelloWorld_max_key_cdr_typesize > 16 ? UnboundedHelloWorld_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnboundedHelloWorldPubSubType::~UnboundedHelloWorldPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool UnboundedHelloWorldPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool UnboundedHelloWorldPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool UnboundedHelloWorldPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool UnboundedHelloWorldPubSubType::deserialize( return true; } -std::function UnboundedHelloWorldPubSubType::getSerializedSizeProvider( +uint32_t UnboundedHelloWorldPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* UnboundedHelloWorldPubSubType::createData() +void* UnboundedHelloWorldPubSubType::create_data() { return reinterpret_cast(new UnboundedHelloWorld()); } -void UnboundedHelloWorldPubSubType::deleteData( +void UnboundedHelloWorldPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnboundedHelloWorldPubSubType::getKey( +bool UnboundedHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool UnboundedHelloWorldPubSubType::getKey( const UnboundedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnboundedHelloWorld_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 || UnboundedHelloWorld_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index 0e1fa937115..1fecf26d245 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -61,18 +61,18 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/blackbox/types/core/core_typesPubSubTypes.cxx b/test/blackbox/types/core/core_typesPubSubTypes.cxx index bb921ed43d2..355602635d4 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.cxx +++ b/test/blackbox/types/core/core_typesPubSubTypes.cxx @@ -38,26 +38,21 @@ namespace eprosima { namespace detail { EntityId_tPubSubType::EntityId_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::EntityId_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityId_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_EntityId_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::EntityId_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_EntityId_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_EntityId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_EntityId_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_EntityId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_EntityId_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityId_tPubSubType::~EntityId_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -75,12 +70,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -95,11 +88,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -116,11 +105,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -137,52 +122,43 @@ namespace eprosima { return true; } - std::function EntityId_tPubSubType::getSerializedSizeProvider( + uint32_t EntityId_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityId_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityId_tPubSubType::create_data() { return reinterpret_cast(new EntityId_t()); } - void EntityId_tPubSubType::deleteData( + void EntityId_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityId_tPubSubType::getKey( + bool EntityId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -190,35 +166,27 @@ namespace eprosima { const EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_EntityId_t_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 || eprosima_fastdds_rtps_core_detail_EntityId_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -231,26 +199,21 @@ namespace eprosima { ProtocolVersion_tPubSubType::ProtocolVersion_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::ProtocolVersion_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(ProtocolVersion_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::ProtocolVersion_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ProtocolVersion_tPubSubType::~ProtocolVersion_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -268,12 +231,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -288,11 +249,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -309,11 +266,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -330,52 +283,43 @@ namespace eprosima { return true; } - std::function ProtocolVersion_tPubSubType::getSerializedSizeProvider( + uint32_t ProtocolVersion_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* ProtocolVersion_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* ProtocolVersion_tPubSubType::create_data() { return reinterpret_cast(new ProtocolVersion_t()); } - void ProtocolVersion_tPubSubType::deleteData( + void ProtocolVersion_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ProtocolVersion_tPubSubType::getKey( + bool ProtocolVersion_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -383,35 +327,27 @@ namespace eprosima { const ProtocolVersion_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_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 || eprosima_fastdds_rtps_core_detail_ProtocolVersion_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -424,26 +360,21 @@ namespace eprosima { VendorId_tPubSubType::VendorId_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::VendorId_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(VendorId_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_VendorId_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::VendorId_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_VendorId_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_VendorId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_VendorId_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_VendorId_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_VendorId_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } VendorId_tPubSubType::~VendorId_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -461,12 +392,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -481,11 +410,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -502,11 +427,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -523,52 +444,43 @@ namespace eprosima { return true; } - std::function VendorId_tPubSubType::getSerializedSizeProvider( + uint32_t VendorId_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* VendorId_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* VendorId_tPubSubType::create_data() { return reinterpret_cast(new VendorId_t()); } - void VendorId_tPubSubType::deleteData( + void VendorId_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool VendorId_tPubSubType::getKey( + bool VendorId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -576,35 +488,27 @@ namespace eprosima { const VendorId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_VendorId_t_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 || eprosima_fastdds_rtps_core_detail_VendorId_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -617,26 +521,21 @@ namespace eprosima { GuidPrefix_tPubSubType::GuidPrefix_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::GuidPrefix_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GuidPrefix_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::GuidPrefix_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GuidPrefix_tPubSubType::~GuidPrefix_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -654,12 +553,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -674,11 +571,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -695,11 +588,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -716,52 +605,43 @@ namespace eprosima { return true; } - std::function GuidPrefix_tPubSubType::getSerializedSizeProvider( + uint32_t GuidPrefix_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GuidPrefix_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GuidPrefix_tPubSubType::create_data() { return reinterpret_cast(new GuidPrefix_t()); } - void GuidPrefix_tPubSubType::deleteData( + void GuidPrefix_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GuidPrefix_tPubSubType::getKey( + bool GuidPrefix_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -769,35 +649,27 @@ namespace eprosima { const GuidPrefix_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_GuidPrefix_t_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 || eprosima_fastdds_rtps_core_detail_GuidPrefix_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -810,26 +682,21 @@ namespace eprosima { GUID_tPubSubType::GUID_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::GUID_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GUID_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_GUID_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::GUID_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_GUID_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_GUID_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_GUID_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_GUID_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_GUID_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GUID_tPubSubType::~GUID_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -847,12 +714,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -867,11 +732,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -888,11 +749,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -909,52 +766,43 @@ namespace eprosima { return true; } - std::function GUID_tPubSubType::getSerializedSizeProvider( + uint32_t GUID_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GUID_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GUID_tPubSubType::create_data() { return reinterpret_cast(new GUID_t()); } - void GUID_tPubSubType::deleteData( + void GUID_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GUID_tPubSubType::getKey( + bool GUID_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -962,35 +810,27 @@ namespace eprosima { const GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_GUID_t_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 || eprosima_fastdds_rtps_core_detail_GUID_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1003,26 +843,21 @@ namespace eprosima { SequenceNumber_tPubSubType::SequenceNumber_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::SequenceNumber_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceNumber_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::SequenceNumber_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceNumber_tPubSubType::~SequenceNumber_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1040,12 +875,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1060,11 +893,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1081,11 +910,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1102,52 +927,43 @@ namespace eprosima { return true; } - std::function SequenceNumber_tPubSubType::getSerializedSizeProvider( + uint32_t SequenceNumber_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SequenceNumber_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SequenceNumber_tPubSubType::create_data() { return reinterpret_cast(new SequenceNumber_t()); } - void SequenceNumber_tPubSubType::deleteData( + void SequenceNumber_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SequenceNumber_tPubSubType::getKey( + bool SequenceNumber_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1155,35 +971,27 @@ namespace eprosima { const SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_SequenceNumber_t_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 || eprosima_fastdds_rtps_core_detail_SequenceNumber_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1196,26 +1004,21 @@ namespace eprosima { Count_tPubSubType::Count_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::Count_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Count_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_Count_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::Count_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_Count_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_Count_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Count_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_Count_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Count_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Count_tPubSubType::~Count_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1233,12 +1036,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1253,11 +1054,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1274,11 +1071,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1295,52 +1088,43 @@ namespace eprosima { return true; } - std::function Count_tPubSubType::getSerializedSizeProvider( + uint32_t Count_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Count_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Count_tPubSubType::create_data() { return reinterpret_cast(new Count_t()); } - void Count_tPubSubType::deleteData( + void Count_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Count_tPubSubType::getKey( + bool Count_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1348,35 +1132,27 @@ namespace eprosima { const Count_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_Count_t_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 || eprosima_fastdds_rtps_core_detail_Count_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1389,26 +1165,21 @@ namespace eprosima { Time_tPubSubType::Time_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::Time_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Time_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_Time_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::Time_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_Time_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_Time_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Time_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_Time_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Time_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Time_tPubSubType::~Time_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1426,12 +1197,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1446,11 +1215,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1467,11 +1232,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1488,52 +1249,43 @@ namespace eprosima { return true; } - std::function Time_tPubSubType::getSerializedSizeProvider( + uint32_t Time_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Time_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Time_tPubSubType::create_data() { return reinterpret_cast(new Time_t()); } - void Time_tPubSubType::deleteData( + void Time_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Time_tPubSubType::getKey( + bool Time_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1541,35 +1293,27 @@ namespace eprosima { const Time_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_Time_t_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 || eprosima_fastdds_rtps_core_detail_Time_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1583,26 +1327,21 @@ namespace eprosima { SequenceNumberSetPubSubType::SequenceNumberSetPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::SequenceNumberSet"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceNumberSet::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::SequenceNumberSet"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceNumberSetPubSubType::~SequenceNumberSetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1620,12 +1359,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1640,11 +1377,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1661,11 +1394,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1682,52 +1411,43 @@ namespace eprosima { return true; } - std::function SequenceNumberSetPubSubType::getSerializedSizeProvider( + uint32_t SequenceNumberSetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SequenceNumberSetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SequenceNumberSetPubSubType::create_data() { return reinterpret_cast(new SequenceNumberSet()); } - void SequenceNumberSetPubSubType::deleteData( + void SequenceNumberSetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SequenceNumberSetPubSubType::getKey( + bool SequenceNumberSetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1735,35 +1455,27 @@ namespace eprosima { const SequenceNumberSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_SequenceNumberSet_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 || eprosima_fastdds_rtps_core_detail_SequenceNumberSet_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1776,26 +1488,21 @@ namespace eprosima { Locator_tPubSubType::Locator_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::Locator_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Locator_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_Locator_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::Locator_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_Locator_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_Locator_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Locator_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_Locator_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Locator_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Locator_tPubSubType::~Locator_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1813,12 +1520,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1833,11 +1538,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1854,11 +1555,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1875,52 +1572,43 @@ namespace eprosima { return true; } - std::function Locator_tPubSubType::getSerializedSizeProvider( + uint32_t Locator_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Locator_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Locator_tPubSubType::create_data() { return reinterpret_cast(new Locator_t()); } - void Locator_tPubSubType::deleteData( + void Locator_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Locator_tPubSubType::getKey( + bool Locator_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1928,35 +1616,27 @@ namespace eprosima { const Locator_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_Locator_t_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 || eprosima_fastdds_rtps_core_detail_Locator_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1969,26 +1649,21 @@ namespace eprosima { Duration_tPubSubType::Duration_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::Duration_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Duration_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_Duration_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::Duration_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_Duration_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_Duration_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Duration_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_Duration_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_Duration_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Duration_tPubSubType::~Duration_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2006,12 +1681,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2026,11 +1699,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2047,11 +1716,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2068,52 +1733,43 @@ namespace eprosima { return true; } - std::function Duration_tPubSubType::getSerializedSizeProvider( + uint32_t Duration_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Duration_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Duration_tPubSubType::create_data() { return reinterpret_cast(new Duration_t()); } - void Duration_tPubSubType::deleteData( + void Duration_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Duration_tPubSubType::getKey( + bool Duration_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2121,35 +1777,27 @@ namespace eprosima { const Duration_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_Duration_t_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 || eprosima_fastdds_rtps_core_detail_Duration_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2164,26 +1812,21 @@ namespace eprosima { StatusInfo_tPubSubType::StatusInfo_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::StatusInfo_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(StatusInfo_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::StatusInfo_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StatusInfo_tPubSubType::~StatusInfo_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2201,12 +1844,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2221,11 +1862,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2242,11 +1879,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2263,52 +1896,43 @@ namespace eprosima { return true; } - std::function StatusInfo_tPubSubType::getSerializedSizeProvider( + uint32_t StatusInfo_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* StatusInfo_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* StatusInfo_tPubSubType::create_data() { return reinterpret_cast(new StatusInfo_t()); } - void StatusInfo_tPubSubType::deleteData( + void StatusInfo_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool StatusInfo_tPubSubType::getKey( + bool StatusInfo_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2316,35 +1940,27 @@ namespace eprosima { const StatusInfo_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_StatusInfo_t_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 || eprosima_fastdds_rtps_core_detail_StatusInfo_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2357,26 +1973,21 @@ namespace eprosima { KeyHash_tPubSubType::KeyHash_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::KeyHash_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyHash_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_KeyHash_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::KeyHash_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_KeyHash_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_KeyHash_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_KeyHash_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_KeyHash_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_KeyHash_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyHash_tPubSubType::~KeyHash_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2394,12 +2005,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2414,11 +2023,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2435,11 +2040,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2456,52 +2057,43 @@ namespace eprosima { return true; } - std::function KeyHash_tPubSubType::getSerializedSizeProvider( + uint32_t KeyHash_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* KeyHash_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* KeyHash_tPubSubType::create_data() { return reinterpret_cast(new KeyHash_t()); } - void KeyHash_tPubSubType::deleteData( + void KeyHash_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool KeyHash_tPubSubType::getKey( + bool KeyHash_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2509,35 +2101,27 @@ namespace eprosima { const KeyHash_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_KeyHash_t_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 || eprosima_fastdds_rtps_core_detail_KeyHash_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2550,26 +2134,21 @@ namespace eprosima { EntityName_tPubSubType::EntityName_tPubSubType() { - setName("eprosima::fastdds::rtps::core::detail::EntityName_t"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityName_t::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_detail_EntityName_t_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::detail::EntityName_t"); + uint32_t type_size = eprosima_fastdds_rtps_core_detail_EntityName_t_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_detail_EntityName_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_EntityName_t_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_detail_EntityName_t_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_detail_EntityName_t_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityName_tPubSubType::~EntityName_tPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2587,12 +2166,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2607,11 +2184,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2628,11 +2201,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2649,52 +2218,43 @@ namespace eprosima { return true; } - std::function EntityName_tPubSubType::getSerializedSizeProvider( + uint32_t EntityName_tPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityName_tPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityName_tPubSubType::create_data() { return reinterpret_cast(new EntityName_t()); } - void EntityName_tPubSubType::deleteData( + void EntityName_tPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityName_tPubSubType::getKey( + bool EntityName_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2702,35 +2262,27 @@ namespace eprosima { const EntityName_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_detail_EntityName_t_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 || eprosima_fastdds_rtps_core_detail_EntityName_t_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2745,26 +2297,21 @@ namespace eprosima { HeaderPubSubType::HeaderPubSubType() { - setName("eprosima::fastdds::rtps::core::Header"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Header::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_Header_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::Header"); + uint32_t type_size = eprosima_fastdds_rtps_core_Header_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_Header_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_Header_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_Header_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_Header_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HeaderPubSubType::~HeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2782,12 +2329,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2802,11 +2347,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2823,11 +2364,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2844,52 +2381,43 @@ namespace eprosima { return true; } - std::function HeaderPubSubType::getSerializedSizeProvider( + uint32_t HeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* HeaderPubSubType::createData() + void* HeaderPubSubType::create_data() { return reinterpret_cast(new Header()); } - void HeaderPubSubType::deleteData( + void HeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool HeaderPubSubType::getKey( + bool HeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2897,35 +2425,27 @@ namespace eprosima { const Header* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_Header_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 || eprosima_fastdds_rtps_core_Header_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2938,26 +2458,21 @@ namespace eprosima { SubmessageHeaderPubSubType::SubmessageHeaderPubSubType() { - setName("eprosima::fastdds::rtps::core::SubmessageHeader"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SubmessageHeader::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_SubmessageHeader_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::SubmessageHeader"); + uint32_t type_size = eprosima_fastdds_rtps_core_SubmessageHeader_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_SubmessageHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_SubmessageHeader_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_SubmessageHeader_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_SubmessageHeader_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SubmessageHeaderPubSubType::~SubmessageHeaderPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2975,12 +2490,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2995,11 +2508,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3016,11 +2525,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3037,52 +2542,43 @@ namespace eprosima { return true; } - std::function SubmessageHeaderPubSubType::getSerializedSizeProvider( + uint32_t SubmessageHeaderPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* SubmessageHeaderPubSubType::createData() + void* SubmessageHeaderPubSubType::create_data() { return reinterpret_cast(new SubmessageHeader()); } - void SubmessageHeaderPubSubType::deleteData( + void SubmessageHeaderPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SubmessageHeaderPubSubType::getKey( + bool SubmessageHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3090,35 +2586,27 @@ namespace eprosima { const SubmessageHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_SubmessageHeader_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 || eprosima_fastdds_rtps_core_SubmessageHeader_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3134,26 +2622,21 @@ namespace eprosima { AckNackSubmessagePubSubType::AckNackSubmessagePubSubType() { - setName("eprosima::fastdds::rtps::core::AckNackSubmessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(AckNackSubmessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_AckNackSubmessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::AckNackSubmessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_AckNackSubmessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_AckNackSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_AckNackSubmessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_AckNackSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_AckNackSubmessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AckNackSubmessagePubSubType::~AckNackSubmessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3171,12 +2654,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3191,11 +2672,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3212,11 +2689,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3233,52 +2706,43 @@ namespace eprosima { return true; } - std::function AckNackSubmessagePubSubType::getSerializedSizeProvider( + uint32_t AckNackSubmessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* AckNackSubmessagePubSubType::createData() + void* AckNackSubmessagePubSubType::create_data() { return reinterpret_cast(new AckNackSubmessage()); } - void AckNackSubmessagePubSubType::deleteData( + void AckNackSubmessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool AckNackSubmessagePubSubType::getKey( + bool AckNackSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3286,35 +2750,27 @@ namespace eprosima { const AckNackSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_AckNackSubmessage_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 || eprosima_fastdds_rtps_core_AckNackSubmessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3327,26 +2783,21 @@ namespace eprosima { HeartBeatSubmessagePubSubType::HeartBeatSubmessagePubSubType() { - setName("eprosima::fastdds::rtps::core::HeartBeatSubmessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(HeartBeatSubmessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::HeartBeatSubmessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } HeartBeatSubmessagePubSubType::~HeartBeatSubmessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3364,12 +2815,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3384,11 +2833,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3405,11 +2850,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3426,52 +2867,43 @@ namespace eprosima { return true; } - std::function HeartBeatSubmessagePubSubType::getSerializedSizeProvider( + uint32_t HeartBeatSubmessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* HeartBeatSubmessagePubSubType::createData() + void* HeartBeatSubmessagePubSubType::create_data() { return reinterpret_cast(new HeartBeatSubmessage()); } - void HeartBeatSubmessagePubSubType::deleteData( + void HeartBeatSubmessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool HeartBeatSubmessagePubSubType::getKey( + bool HeartBeatSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3479,35 +2911,27 @@ namespace eprosima { const HeartBeatSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_HeartBeatSubmessage_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 || eprosima_fastdds_rtps_core_HeartBeatSubmessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3520,26 +2944,21 @@ namespace eprosima { InfoDestinationSubmessagePubSubType::InfoDestinationSubmessagePubSubType() { - setName("eprosima::fastdds::rtps::core::InfoDestinationSubmessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(InfoDestinationSubmessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::InfoDestinationSubmessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InfoDestinationSubmessagePubSubType::~InfoDestinationSubmessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3557,12 +2976,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3577,11 +2994,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3598,11 +3011,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3619,52 +3028,43 @@ namespace eprosima { return true; } - std::function InfoDestinationSubmessagePubSubType::getSerializedSizeProvider( + uint32_t InfoDestinationSubmessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* InfoDestinationSubmessagePubSubType::createData() + void* InfoDestinationSubmessagePubSubType::create_data() { return reinterpret_cast(new InfoDestinationSubmessage()); } - void InfoDestinationSubmessagePubSubType::deleteData( + void InfoDestinationSubmessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool InfoDestinationSubmessagePubSubType::getKey( + bool InfoDestinationSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3672,35 +3072,27 @@ namespace eprosima { const InfoDestinationSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_InfoDestinationSubmessage_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 || eprosima_fastdds_rtps_core_InfoDestinationSubmessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3713,26 +3105,21 @@ namespace eprosima { InfoSourceSubmessagePubSubType::InfoSourceSubmessagePubSubType() { - setName("eprosima::fastdds::rtps::core::InfoSourceSubmessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(InfoSourceSubmessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::InfoSourceSubmessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InfoSourceSubmessagePubSubType::~InfoSourceSubmessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3750,12 +3137,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3770,11 +3155,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3791,11 +3172,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3812,52 +3189,43 @@ namespace eprosima { return true; } - std::function InfoSourceSubmessagePubSubType::getSerializedSizeProvider( + uint32_t InfoSourceSubmessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* InfoSourceSubmessagePubSubType::createData() + void* InfoSourceSubmessagePubSubType::create_data() { return reinterpret_cast(new InfoSourceSubmessage()); } - void InfoSourceSubmessagePubSubType::deleteData( + void InfoSourceSubmessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool InfoSourceSubmessagePubSubType::getKey( + bool InfoSourceSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3865,35 +3233,27 @@ namespace eprosima { const InfoSourceSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_InfoSourceSubmessage_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 || eprosima_fastdds_rtps_core_InfoSourceSubmessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3906,26 +3266,21 @@ namespace eprosima { InfoTimestampSubmessagePubSubType::InfoTimestampSubmessagePubSubType() { - setName("eprosima::fastdds::rtps::core::InfoTimestampSubmessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(InfoTimestampSubmessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::InfoTimestampSubmessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InfoTimestampSubmessagePubSubType::~InfoTimestampSubmessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3943,12 +3298,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3963,11 +3316,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3984,11 +3333,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4005,52 +3350,43 @@ namespace eprosima { return true; } - std::function InfoTimestampSubmessagePubSubType::getSerializedSizeProvider( + uint32_t InfoTimestampSubmessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* InfoTimestampSubmessagePubSubType::createData() + void* InfoTimestampSubmessagePubSubType::create_data() { return reinterpret_cast(new InfoTimestampSubmessage()); } - void InfoTimestampSubmessagePubSubType::deleteData( + void InfoTimestampSubmessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool InfoTimestampSubmessagePubSubType::getKey( + bool InfoTimestampSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4058,35 +3394,27 @@ namespace eprosima { const InfoTimestampSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_InfoTimestampSubmessage_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 || eprosima_fastdds_rtps_core_InfoTimestampSubmessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4100,26 +3428,21 @@ namespace eprosima { RTPSMessagePubSubType::RTPSMessagePubSubType() { - setName("eprosima::fastdds::rtps::core::RTPSMessage"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(RTPSMessage::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_rtps_core_RTPSMessage_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::rtps::core::RTPSMessage"); + uint32_t type_size = eprosima_fastdds_rtps_core_RTPSMessage_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_rtps_core_RTPSMessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_RTPSMessage_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_rtps_core_RTPSMessage_max_key_cdr_typesize > 16 ? eprosima_fastdds_rtps_core_RTPSMessage_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } RTPSMessagePubSubType::~RTPSMessagePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4137,12 +3460,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4157,11 +3478,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4178,11 +3495,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4199,52 +3512,43 @@ namespace eprosima { return true; } - std::function RTPSMessagePubSubType::getSerializedSizeProvider( + uint32_t RTPSMessagePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* RTPSMessagePubSubType::createData() + void* RTPSMessagePubSubType::create_data() { return reinterpret_cast(new RTPSMessage()); } - void RTPSMessagePubSubType::deleteData( + void RTPSMessagePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool RTPSMessagePubSubType::getKey( + bool RTPSMessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4252,35 +3556,27 @@ namespace eprosima { const RTPSMessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_rtps_core_RTPSMessage_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 || eprosima_fastdds_rtps_core_RTPSMessage_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index b5c8a45e887..5ac732a9a1b 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -71,18 +71,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -117,8 +117,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -145,18 +145,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,8 +191,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -219,18 +219,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -265,8 +265,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -293,18 +293,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -339,8 +339,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -367,18 +367,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -413,8 +413,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -441,18 +441,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -487,8 +487,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -515,18 +515,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -561,8 +561,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -589,18 +589,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -635,8 +635,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef eprosima::fastdds::rtps::core::detail::Time_t Timestamp; @@ -664,18 +664,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -710,8 +710,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -738,18 +738,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -784,8 +784,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -812,18 +812,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -858,8 +858,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef uint32_t DomainId_t; @@ -888,18 +888,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -934,8 +934,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -962,18 +962,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1008,8 +1008,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1036,18 +1036,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1082,8 +1082,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace detail @@ -1111,18 +1111,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1157,8 +1157,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1185,18 +1185,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1231,8 +1231,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace SubmessageKind @@ -1262,18 +1262,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1308,8 +1308,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1336,18 +1336,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1382,8 +1382,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1410,18 +1410,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1456,8 +1456,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1484,18 +1484,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1530,8 +1530,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1558,18 +1558,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1604,8 +1604,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1633,18 +1633,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1679,8 +1679,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace core diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx index d0e23ab6f51..e44afd7d737 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx @@ -36,26 +36,21 @@ namespace eprosima { namespace statistics { ConnectionPubSubType::ConnectionPubSubType() { - setName("eprosima::fastdds::statistics::Connection"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Connection::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Connection_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Connection"); + uint32_t type_size = eprosima_fastdds_statistics_Connection_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Connection_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Connection_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ConnectionPubSubType::~ConnectionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -73,12 +68,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -93,11 +86,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -114,11 +103,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -135,52 +120,43 @@ namespace eprosima { return true; } - std::function ConnectionPubSubType::getSerializedSizeProvider( + uint32_t ConnectionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ConnectionPubSubType::createData() + void* ConnectionPubSubType::create_data() { return reinterpret_cast(new Connection()); } - void ConnectionPubSubType::deleteData( + void ConnectionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ConnectionPubSubType::getKey( + bool ConnectionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -188,35 +164,27 @@ namespace eprosima { const Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Connection_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 || eprosima_fastdds_statistics_Connection_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -229,26 +197,21 @@ namespace eprosima { QosPolicyCount_sPubSubType::QosPolicyCount_sPubSubType() { - setName("eprosima::fastdds::statistics::QosPolicyCount_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(QosPolicyCount_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_QosPolicyCount_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::QosPolicyCount_s"); + uint32_t type_size = eprosima_fastdds_statistics_QosPolicyCount_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } QosPolicyCount_sPubSubType::~QosPolicyCount_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -266,12 +229,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -286,11 +247,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -307,11 +264,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -328,52 +281,43 @@ namespace eprosima { return true; } - std::function QosPolicyCount_sPubSubType::getSerializedSizeProvider( + uint32_t QosPolicyCount_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* QosPolicyCount_sPubSubType::createData() + void* QosPolicyCount_sPubSubType::create_data() { return reinterpret_cast(new QosPolicyCount_s()); } - void QosPolicyCount_sPubSubType::deleteData( + void QosPolicyCount_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool QosPolicyCount_sPubSubType::getKey( + bool QosPolicyCount_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -381,35 +325,27 @@ namespace eprosima { const QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_QosPolicyCount_s_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 || eprosima_fastdds_statistics_QosPolicyCount_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -422,26 +358,21 @@ namespace eprosima { BaseStatus_sPubSubType::BaseStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::BaseStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(BaseStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::BaseStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_BaseStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BaseStatus_sPubSubType::~BaseStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -459,12 +390,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -479,11 +408,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -500,11 +425,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -521,52 +442,43 @@ namespace eprosima { return true; } - std::function BaseStatus_sPubSubType::getSerializedSizeProvider( + uint32_t BaseStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* BaseStatus_sPubSubType::createData() + void* BaseStatus_sPubSubType::create_data() { return reinterpret_cast(new BaseStatus_s()); } - void BaseStatus_sPubSubType::deleteData( + void BaseStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool BaseStatus_sPubSubType::getKey( + bool BaseStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -574,35 +486,27 @@ namespace eprosima { const BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_BaseStatus_s_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 || eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -616,26 +520,21 @@ namespace eprosima { IncompatibleQoSStatus_sPubSubType::IncompatibleQoSStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::IncompatibleQoSStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(IncompatibleQoSStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::IncompatibleQoSStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } IncompatibleQoSStatus_sPubSubType::~IncompatibleQoSStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -653,12 +552,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -673,11 +570,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -694,11 +587,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -715,52 +604,43 @@ namespace eprosima { return true; } - std::function IncompatibleQoSStatus_sPubSubType::getSerializedSizeProvider( + uint32_t IncompatibleQoSStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* IncompatibleQoSStatus_sPubSubType::createData() + void* IncompatibleQoSStatus_sPubSubType::create_data() { return reinterpret_cast(new IncompatibleQoSStatus_s()); } - void IncompatibleQoSStatus_sPubSubType::deleteData( + void IncompatibleQoSStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool IncompatibleQoSStatus_sPubSubType::getKey( + bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -768,35 +648,27 @@ namespace eprosima { const IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_IncompatibleQoSStatus_s_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 || eprosima_fastdds_statistics_IncompatibleQoSStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -809,26 +681,21 @@ namespace eprosima { LivelinessChangedStatus_sPubSubType::LivelinessChangedStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::LivelinessChangedStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(LivelinessChangedStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::LivelinessChangedStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LivelinessChangedStatus_sPubSubType::~LivelinessChangedStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -846,12 +713,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -866,11 +731,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -887,11 +748,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -908,52 +765,43 @@ namespace eprosima { return true; } - std::function LivelinessChangedStatus_sPubSubType::getSerializedSizeProvider( + uint32_t LivelinessChangedStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* LivelinessChangedStatus_sPubSubType::createData() + void* LivelinessChangedStatus_sPubSubType::create_data() { return reinterpret_cast(new LivelinessChangedStatus_s()); } - void LivelinessChangedStatus_sPubSubType::deleteData( + void LivelinessChangedStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool LivelinessChangedStatus_sPubSubType::getKey( + bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -961,35 +809,27 @@ namespace eprosima { const LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_LivelinessChangedStatus_s_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 || eprosima_fastdds_statistics_LivelinessChangedStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1002,26 +842,21 @@ namespace eprosima { DeadlineMissedStatus_sPubSubType::DeadlineMissedStatus_sPubSubType() { - setName("eprosima::fastdds::statistics::DeadlineMissedStatus_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(DeadlineMissedStatus_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::DeadlineMissedStatus_s"); + uint32_t type_size = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DeadlineMissedStatus_sPubSubType::~DeadlineMissedStatus_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1039,12 +874,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1059,11 +892,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1080,11 +909,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1101,52 +926,43 @@ namespace eprosima { return true; } - std::function DeadlineMissedStatus_sPubSubType::getSerializedSizeProvider( + uint32_t DeadlineMissedStatus_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* DeadlineMissedStatus_sPubSubType::createData() + void* DeadlineMissedStatus_sPubSubType::create_data() { return reinterpret_cast(new DeadlineMissedStatus_s()); } - void DeadlineMissedStatus_sPubSubType::deleteData( + void DeadlineMissedStatus_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool DeadlineMissedStatus_sPubSubType::getKey( + bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1154,35 +970,27 @@ namespace eprosima { const DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_DeadlineMissedStatus_s_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 || eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1202,26 +1010,21 @@ namespace eprosima { MonitorServiceStatusDataPubSubType::MonitorServiceStatusDataPubSubType() { - setName("eprosima::fastdds::statistics::MonitorServiceStatusData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(MonitorServiceStatusData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_MonitorServiceStatusData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::MonitorServiceStatusData"); + uint32_t type_size = eprosima_fastdds_statistics_MonitorServiceStatusData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MonitorServiceStatusDataPubSubType::~MonitorServiceStatusDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1239,12 +1042,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1259,11 +1060,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1280,11 +1077,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1301,52 +1094,43 @@ namespace eprosima { return true; } - std::function MonitorServiceStatusDataPubSubType::getSerializedSizeProvider( + uint32_t MonitorServiceStatusDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* MonitorServiceStatusDataPubSubType::createData() + void* MonitorServiceStatusDataPubSubType::create_data() { return reinterpret_cast(new MonitorServiceStatusData()); } - void MonitorServiceStatusDataPubSubType::deleteData( + void MonitorServiceStatusDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool MonitorServiceStatusDataPubSubType::getKey( + bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1354,35 +1138,27 @@ namespace eprosima { const MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_MonitorServiceStatusData_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 || eprosima_fastdds_statistics_MonitorServiceStatusData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index 951c853eedf..92123608850 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -68,18 +68,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -114,8 +114,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -142,18 +142,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -188,8 +188,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -216,18 +216,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -262,8 +262,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef std::vector QosPolicyCountSeq_s; @@ -291,18 +291,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -337,8 +337,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -365,18 +365,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -411,8 +411,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -439,18 +439,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -485,8 +485,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s; @@ -530,18 +530,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -576,8 +576,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace statistics diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index fbc16b14e72..37748c7c06c 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -37,26 +37,21 @@ namespace eprosima { namespace detail { EntityId_sPubSubType::EntityId_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::EntityId_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityId_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_EntityId_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::EntityId_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_EntityId_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityId_sPubSubType::~EntityId_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -74,12 +69,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -94,11 +87,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -115,11 +104,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -136,52 +121,43 @@ namespace eprosima { return true; } - std::function EntityId_sPubSubType::getSerializedSizeProvider( + uint32_t EntityId_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityId_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityId_sPubSubType::create_data() { return reinterpret_cast(new EntityId_s()); } - void EntityId_sPubSubType::deleteData( + void EntityId_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityId_sPubSubType::getKey( + bool EntityId_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -189,35 +165,27 @@ namespace eprosima { const EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_EntityId_s_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 || eprosima_fastdds_statistics_detail_EntityId_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -230,26 +198,21 @@ namespace eprosima { GuidPrefix_sPubSubType::GuidPrefix_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::GuidPrefix_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GuidPrefix_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::GuidPrefix_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GuidPrefix_sPubSubType::~GuidPrefix_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -267,12 +230,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -287,11 +248,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -308,11 +265,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -329,52 +282,43 @@ namespace eprosima { return true; } - std::function GuidPrefix_sPubSubType::getSerializedSizeProvider( + uint32_t GuidPrefix_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GuidPrefix_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GuidPrefix_sPubSubType::create_data() { return reinterpret_cast(new GuidPrefix_s()); } - void GuidPrefix_sPubSubType::deleteData( + void GuidPrefix_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GuidPrefix_sPubSubType::getKey( + bool GuidPrefix_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -382,35 +326,27 @@ namespace eprosima { const GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_GuidPrefix_s_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 || eprosima_fastdds_statistics_detail_GuidPrefix_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -423,26 +359,21 @@ namespace eprosima { GUID_sPubSubType::GUID_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::GUID_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(GUID_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_GUID_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::GUID_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_GUID_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GUID_sPubSubType::~GUID_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -460,12 +391,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -480,11 +409,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -501,11 +426,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -522,52 +443,43 @@ namespace eprosima { return true; } - std::function GUID_sPubSubType::getSerializedSizeProvider( + uint32_t GUID_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* GUID_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* GUID_sPubSubType::create_data() { return reinterpret_cast(new GUID_s()); } - void GUID_sPubSubType::deleteData( + void GUID_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool GUID_sPubSubType::getKey( + bool GUID_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -575,35 +487,27 @@ namespace eprosima { const GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_GUID_s_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 || eprosima_fastdds_statistics_detail_GUID_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -616,26 +520,21 @@ namespace eprosima { SequenceNumber_sPubSubType::SequenceNumber_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::SequenceNumber_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceNumber_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_SequenceNumber_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::SequenceNumber_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceNumber_sPubSubType::~SequenceNumber_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -653,12 +552,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -673,11 +570,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -694,11 +587,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -715,52 +604,43 @@ namespace eprosima { return true; } - std::function SequenceNumber_sPubSubType::getSerializedSizeProvider( + uint32_t SequenceNumber_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SequenceNumber_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SequenceNumber_sPubSubType::create_data() { return reinterpret_cast(new SequenceNumber_s()); } - void SequenceNumber_sPubSubType::deleteData( + void SequenceNumber_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SequenceNumber_sPubSubType::getKey( + bool SequenceNumber_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -768,35 +648,27 @@ namespace eprosima { const SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_SequenceNumber_s_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 || eprosima_fastdds_statistics_detail_SequenceNumber_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -809,26 +681,21 @@ namespace eprosima { SampleIdentity_sPubSubType::SampleIdentity_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::SampleIdentity_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SampleIdentity_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_SampleIdentity_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::SampleIdentity_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SampleIdentity_sPubSubType::~SampleIdentity_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -846,12 +713,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -866,11 +731,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -887,11 +748,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -908,52 +765,43 @@ namespace eprosima { return true; } - std::function SampleIdentity_sPubSubType::getSerializedSizeProvider( + uint32_t SampleIdentity_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SampleIdentity_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SampleIdentity_sPubSubType::create_data() { return reinterpret_cast(new SampleIdentity_s()); } - void SampleIdentity_sPubSubType::deleteData( + void SampleIdentity_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SampleIdentity_sPubSubType::getKey( + bool SampleIdentity_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -961,35 +809,27 @@ namespace eprosima { const SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_SampleIdentity_s_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 || eprosima_fastdds_statistics_detail_SampleIdentity_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1002,26 +842,21 @@ namespace eprosima { Locator_sPubSubType::Locator_sPubSubType() { - setName("eprosima::fastdds::statistics::detail::Locator_s"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Locator_s::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::detail::Locator_s"); + uint32_t type_size = eprosima_fastdds_statistics_detail_Locator_s_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Locator_sPubSubType::~Locator_sPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1039,12 +874,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1059,11 +892,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1080,11 +909,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1101,52 +926,43 @@ namespace eprosima { return true; } - std::function Locator_sPubSubType::getSerializedSizeProvider( + uint32_t Locator_sPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Locator_sPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Locator_sPubSubType::create_data() { return reinterpret_cast(new Locator_s()); } - void Locator_sPubSubType::deleteData( + void Locator_sPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Locator_sPubSubType::getKey( + bool Locator_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1154,35 +970,27 @@ namespace eprosima { const Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_detail_Locator_s_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 || eprosima_fastdds_statistics_detail_Locator_s_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1197,26 +1005,21 @@ namespace eprosima { DiscoveryTimePubSubType::DiscoveryTimePubSubType() { - setName("eprosima::fastdds::statistics::DiscoveryTime"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(DiscoveryTime::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::DiscoveryTime"); + uint32_t type_size = eprosima_fastdds_statistics_DiscoveryTime_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DiscoveryTimePubSubType::~DiscoveryTimePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1234,12 +1037,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1254,11 +1055,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1275,11 +1072,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1296,52 +1089,43 @@ namespace eprosima { return true; } - std::function DiscoveryTimePubSubType::getSerializedSizeProvider( + uint32_t DiscoveryTimePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* DiscoveryTimePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* DiscoveryTimePubSubType::create_data() { return reinterpret_cast(new DiscoveryTime()); } - void DiscoveryTimePubSubType::deleteData( + void DiscoveryTimePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool DiscoveryTimePubSubType::getKey( + bool DiscoveryTimePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1349,35 +1133,27 @@ namespace eprosima { const DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_DiscoveryTime_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 || eprosima_fastdds_statistics_DiscoveryTime_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1390,26 +1166,21 @@ namespace eprosima { EntityCountPubSubType::EntityCountPubSubType() { - setName("eprosima::fastdds::statistics::EntityCount"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityCount::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_EntityCount_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::EntityCount"); + uint32_t type_size = eprosima_fastdds_statistics_EntityCount_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityCountPubSubType::~EntityCountPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1427,12 +1198,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1447,11 +1216,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1468,11 +1233,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1489,52 +1250,43 @@ namespace eprosima { return true; } - std::function EntityCountPubSubType::getSerializedSizeProvider( + uint32_t EntityCountPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityCountPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityCountPubSubType::create_data() { return reinterpret_cast(new EntityCount()); } - void EntityCountPubSubType::deleteData( + void EntityCountPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityCountPubSubType::getKey( + bool EntityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1542,35 +1294,27 @@ namespace eprosima { const EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_EntityCount_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 || eprosima_fastdds_statistics_EntityCount_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1583,26 +1327,21 @@ namespace eprosima { SampleIdentityCountPubSubType::SampleIdentityCountPubSubType() { - setName("eprosima::fastdds::statistics::SampleIdentityCount"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(SampleIdentityCount::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_SampleIdentityCount_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::SampleIdentityCount"); + uint32_t type_size = eprosima_fastdds_statistics_SampleIdentityCount_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SampleIdentityCountPubSubType::~SampleIdentityCountPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1620,12 +1359,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1640,11 +1377,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1661,11 +1394,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1682,52 +1411,43 @@ namespace eprosima { return true; } - std::function SampleIdentityCountPubSubType::getSerializedSizeProvider( + uint32_t SampleIdentityCountPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* SampleIdentityCountPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* SampleIdentityCountPubSubType::create_data() { return reinterpret_cast(new SampleIdentityCount()); } - void SampleIdentityCountPubSubType::deleteData( + void SampleIdentityCountPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool SampleIdentityCountPubSubType::getKey( + bool SampleIdentityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1735,35 +1455,27 @@ namespace eprosima { const SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_SampleIdentityCount_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 || eprosima_fastdds_statistics_SampleIdentityCount_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1776,26 +1488,21 @@ namespace eprosima { Entity2LocatorTrafficPubSubType::Entity2LocatorTrafficPubSubType() { - setName("eprosima::fastdds::statistics::Entity2LocatorTraffic"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Entity2LocatorTraffic::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Entity2LocatorTraffic_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Entity2LocatorTraffic"); + uint32_t type_size = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Entity2LocatorTrafficPubSubType::~Entity2LocatorTrafficPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1813,12 +1520,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1833,11 +1538,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1854,11 +1555,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1875,52 +1572,43 @@ namespace eprosima { return true; } - std::function Entity2LocatorTrafficPubSubType::getSerializedSizeProvider( + uint32_t Entity2LocatorTrafficPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Entity2LocatorTrafficPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Entity2LocatorTrafficPubSubType::create_data() { return reinterpret_cast(new Entity2LocatorTraffic()); } - void Entity2LocatorTrafficPubSubType::deleteData( + void Entity2LocatorTrafficPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Entity2LocatorTrafficPubSubType::getKey( + bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1928,35 +1616,27 @@ namespace eprosima { const Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Entity2LocatorTraffic_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 || eprosima_fastdds_statistics_Entity2LocatorTraffic_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1969,26 +1649,21 @@ namespace eprosima { WriterReaderDataPubSubType::WriterReaderDataPubSubType() { - setName("eprosima::fastdds::statistics::WriterReaderData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(WriterReaderData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_WriterReaderData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::WriterReaderData"); + uint32_t type_size = eprosima_fastdds_statistics_WriterReaderData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } WriterReaderDataPubSubType::~WriterReaderDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2006,12 +1681,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2026,11 +1699,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2047,11 +1716,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2068,52 +1733,43 @@ namespace eprosima { return true; } - std::function WriterReaderDataPubSubType::getSerializedSizeProvider( + uint32_t WriterReaderDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* WriterReaderDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* WriterReaderDataPubSubType::create_data() { return reinterpret_cast(new WriterReaderData()); } - void WriterReaderDataPubSubType::deleteData( + void WriterReaderDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool WriterReaderDataPubSubType::getKey( + bool WriterReaderDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2121,35 +1777,27 @@ namespace eprosima { const WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_WriterReaderData_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 || eprosima_fastdds_statistics_WriterReaderData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2162,26 +1810,21 @@ namespace eprosima { Locator2LocatorDataPubSubType::Locator2LocatorDataPubSubType() { - setName("eprosima::fastdds::statistics::Locator2LocatorData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Locator2LocatorData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_Locator2LocatorData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::Locator2LocatorData"); + uint32_t type_size = eprosima_fastdds_statistics_Locator2LocatorData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Locator2LocatorDataPubSubType::~Locator2LocatorDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2199,12 +1842,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2219,11 +1860,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2240,11 +1877,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2261,52 +1894,43 @@ namespace eprosima { return true; } - std::function Locator2LocatorDataPubSubType::getSerializedSizeProvider( + uint32_t Locator2LocatorDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* Locator2LocatorDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* Locator2LocatorDataPubSubType::create_data() { return reinterpret_cast(new Locator2LocatorData()); } - void Locator2LocatorDataPubSubType::deleteData( + void Locator2LocatorDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Locator2LocatorDataPubSubType::getKey( + bool Locator2LocatorDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2314,35 +1938,27 @@ namespace eprosima { const Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_Locator2LocatorData_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 || eprosima_fastdds_statistics_Locator2LocatorData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2355,26 +1971,21 @@ namespace eprosima { EntityDataPubSubType::EntityDataPubSubType() { - setName("eprosima::fastdds::statistics::EntityData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(EntityData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_EntityData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::EntityData"); + uint32_t type_size = eprosima_fastdds_statistics_EntityData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EntityDataPubSubType::~EntityDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2392,12 +2003,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2412,11 +2021,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2433,11 +2038,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2454,52 +2055,43 @@ namespace eprosima { return true; } - std::function EntityDataPubSubType::getSerializedSizeProvider( + uint32_t EntityDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* EntityDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* EntityDataPubSubType::create_data() { return reinterpret_cast(new EntityData()); } - void EntityDataPubSubType::deleteData( + void EntityDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool EntityDataPubSubType::getKey( + bool EntityDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2507,35 +2099,27 @@ namespace eprosima { const EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_EntityData_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 || eprosima_fastdds_statistics_EntityData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2548,26 +2132,21 @@ namespace eprosima { PhysicalDataPubSubType::PhysicalDataPubSubType() { - setName("eprosima::fastdds::statistics::PhysicalData"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(PhysicalData::getMaxCdrSerializedSize()); - #else - eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize; - #endif + set_name("eprosima::fastdds::statistics::PhysicalData"); + uint32_t type_size = eprosima_fastdds_statistics_PhysicalData_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16 ? eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PhysicalDataPubSubType::~PhysicalDataPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2585,12 +2164,10 @@ namespace eprosima { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2605,11 +2182,7 @@ namespace eprosima { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2626,11 +2199,7 @@ namespace eprosima { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2647,52 +2216,43 @@ namespace eprosima { return true; } - std::function PhysicalDataPubSubType::getSerializedSizeProvider( + uint32_t PhysicalDataPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* PhysicalDataPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* PhysicalDataPubSubType::create_data() { return reinterpret_cast(new PhysicalData()); } - void PhysicalDataPubSubType::deleteData( + void PhysicalDataPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool PhysicalDataPubSubType::getKey( + bool PhysicalDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2700,35 +2260,27 @@ namespace eprosima { const PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), eprosima_fastdds_statistics_PhysicalData_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 || eprosima_fastdds_statistics_PhysicalData_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index 77c37085ca3..bec7ad3b50b 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -69,18 +69,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -115,8 +115,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,18 +143,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -189,8 +189,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -217,18 +217,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -263,8 +263,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -291,18 +291,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -337,8 +337,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -365,18 +365,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -411,8 +411,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -439,18 +439,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -485,8 +485,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace detail @@ -514,18 +514,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -560,8 +560,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -588,18 +588,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -634,8 +634,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -662,18 +662,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -708,8 +708,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -736,18 +736,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -782,8 +782,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -810,18 +810,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -856,8 +856,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -884,18 +884,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -930,8 +930,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -958,18 +958,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1004,8 +1004,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1032,18 +1032,18 @@ namespace eprosima eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1078,8 +1078,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace EventKind diff --git a/test/dds-types-test/aliasesPubSubTypes.cxx b/test/dds-types-test/aliasesPubSubTypes.cxx index 763cadc162e..6c2fa2a30eb 100644 --- a/test/dds-types-test/aliasesPubSubTypes.cxx +++ b/test/dds-types-test/aliasesPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AliasInt16PubSubType::AliasInt16PubSubType() { - setName("AliasInt16"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasInt16::getMaxCdrSerializedSize()); -#else - AliasInt16_max_cdr_typesize; -#endif + set_name("AliasInt16"); + uint32_t type_size = AliasInt16_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasInt16_max_key_cdr_typesize > 16 ? AliasInt16_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasInt16_max_key_cdr_typesize > 16 ? AliasInt16_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasInt16PubSubType::~AliasInt16PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool AliasInt16PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool AliasInt16PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool AliasInt16PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool AliasInt16PubSubType::deserialize( return true; } -std::function AliasInt16PubSubType::getSerializedSizeProvider( +uint32_t AliasInt16PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasInt16PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasInt16PubSubType::create_data() { return reinterpret_cast(new AliasInt16()); } -void AliasInt16PubSubType::deleteData( +void AliasInt16PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasInt16PubSubType::getKey( +bool AliasInt16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool AliasInt16PubSubType::getKey( const AliasInt16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasInt16_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 || AliasInt16_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void AliasInt16PubSubType::register_type_object_representation() AliasUint16PubSubType::AliasUint16PubSubType() { - setName("AliasUint16"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasUint16::getMaxCdrSerializedSize()); -#else - AliasUint16_max_cdr_typesize; -#endif + set_name("AliasUint16"); + uint32_t type_size = AliasUint16_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasUint16_max_key_cdr_typesize > 16 ? AliasUint16_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasUint16_max_key_cdr_typesize > 16 ? AliasUint16_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasUint16PubSubType::~AliasUint16PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool AliasUint16PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool AliasUint16PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool AliasUint16PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool AliasUint16PubSubType::deserialize( return true; } -std::function AliasUint16PubSubType::getSerializedSizeProvider( +uint32_t AliasUint16PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasUint16PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasUint16PubSubType::create_data() { return reinterpret_cast(new AliasUint16()); } -void AliasUint16PubSubType::deleteData( +void AliasUint16PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasUint16PubSubType::getKey( +bool AliasUint16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool AliasUint16PubSubType::getKey( const AliasUint16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasUint16_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 || AliasUint16_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void AliasUint16PubSubType::register_type_object_representation() AliasInt32PubSubType::AliasInt32PubSubType() { - setName("AliasInt32"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasInt32::getMaxCdrSerializedSize()); -#else - AliasInt32_max_cdr_typesize; -#endif + set_name("AliasInt32"); + uint32_t type_size = AliasInt32_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasInt32_max_key_cdr_typesize > 16 ? AliasInt32_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasInt32_max_key_cdr_typesize > 16 ? AliasInt32_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasInt32PubSubType::~AliasInt32PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool AliasInt32PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool AliasInt32PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool AliasInt32PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool AliasInt32PubSubType::deserialize( return true; } -std::function AliasInt32PubSubType::getSerializedSizeProvider( +uint32_t AliasInt32PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasInt32PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasInt32PubSubType::create_data() { return reinterpret_cast(new AliasInt32()); } -void AliasInt32PubSubType::deleteData( +void AliasInt32PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasInt32PubSubType::getKey( +bool AliasInt32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool AliasInt32PubSubType::getKey( const AliasInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasInt32_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 || AliasInt32_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void AliasInt32PubSubType::register_type_object_representation() AliasUInt32PubSubType::AliasUInt32PubSubType() { - setName("AliasUInt32"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasUInt32::getMaxCdrSerializedSize()); -#else - AliasUInt32_max_cdr_typesize; -#endif + set_name("AliasUInt32"); + uint32_t type_size = AliasUInt32_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasUInt32_max_key_cdr_typesize > 16 ? AliasUInt32_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasUInt32_max_key_cdr_typesize > 16 ? AliasUInt32_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasUInt32PubSubType::~AliasUInt32PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool AliasUInt32PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool AliasUInt32PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool AliasUInt32PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool AliasUInt32PubSubType::deserialize( return true; } -std::function AliasUInt32PubSubType::getSerializedSizeProvider( +uint32_t AliasUInt32PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasUInt32PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasUInt32PubSubType::create_data() { return reinterpret_cast(new AliasUInt32()); } -void AliasUInt32PubSubType::deleteData( +void AliasUInt32PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasUInt32PubSubType::getKey( +bool AliasUInt32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool AliasUInt32PubSubType::getKey( const AliasUInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasUInt32_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 || AliasUInt32_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void AliasUInt32PubSubType::register_type_object_representation() AliasInt64PubSubType::AliasInt64PubSubType() { - setName("AliasInt64"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasInt64::getMaxCdrSerializedSize()); -#else - AliasInt64_max_cdr_typesize; -#endif + set_name("AliasInt64"); + uint32_t type_size = AliasInt64_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasInt64_max_key_cdr_typesize > 16 ? AliasInt64_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasInt64_max_key_cdr_typesize > 16 ? AliasInt64_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasInt64PubSubType::~AliasInt64PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool AliasInt64PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool AliasInt64PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool AliasInt64PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool AliasInt64PubSubType::deserialize( return true; } -std::function AliasInt64PubSubType::getSerializedSizeProvider( +uint32_t AliasInt64PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasInt64PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasInt64PubSubType::create_data() { return reinterpret_cast(new AliasInt64()); } -void AliasInt64PubSubType::deleteData( +void AliasInt64PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasInt64PubSubType::getKey( +bool AliasInt64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool AliasInt64PubSubType::getKey( const AliasInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasInt64_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 || AliasInt64_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void AliasInt64PubSubType::register_type_object_representation() AliasUInt64PubSubType::AliasUInt64PubSubType() { - setName("AliasUInt64"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasUInt64::getMaxCdrSerializedSize()); -#else - AliasUInt64_max_cdr_typesize; -#endif + set_name("AliasUInt64"); + uint32_t type_size = AliasUInt64_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasUInt64_max_key_cdr_typesize > 16 ? AliasUInt64_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasUInt64_max_key_cdr_typesize > 16 ? AliasUInt64_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasUInt64PubSubType::~AliasUInt64PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool AliasUInt64PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool AliasUInt64PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool AliasUInt64PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool AliasUInt64PubSubType::deserialize( return true; } -std::function AliasUInt64PubSubType::getSerializedSizeProvider( +uint32_t AliasUInt64PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasUInt64PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasUInt64PubSubType::create_data() { return reinterpret_cast(new AliasUInt64()); } -void AliasUInt64PubSubType::deleteData( +void AliasUInt64PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasUInt64PubSubType::getKey( +bool AliasUInt64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool AliasUInt64PubSubType::getKey( const AliasUInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasUInt64_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 || AliasUInt64_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void AliasUInt64PubSubType::register_type_object_representation() AliasFloat32PubSubType::AliasFloat32PubSubType() { - setName("AliasFloat32"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasFloat32::getMaxCdrSerializedSize()); -#else - AliasFloat32_max_cdr_typesize; -#endif + set_name("AliasFloat32"); + uint32_t type_size = AliasFloat32_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasFloat32_max_key_cdr_typesize > 16 ? AliasFloat32_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasFloat32_max_key_cdr_typesize > 16 ? AliasFloat32_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasFloat32PubSubType::~AliasFloat32PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool AliasFloat32PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool AliasFloat32PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool AliasFloat32PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool AliasFloat32PubSubType::deserialize( return true; } -std::function AliasFloat32PubSubType::getSerializedSizeProvider( +uint32_t AliasFloat32PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasFloat32PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasFloat32PubSubType::create_data() { return reinterpret_cast(new AliasFloat32()); } -void AliasFloat32PubSubType::deleteData( +void AliasFloat32PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasFloat32PubSubType::getKey( +bool AliasFloat32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool AliasFloat32PubSubType::getKey( const AliasFloat32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasFloat32_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 || AliasFloat32_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void AliasFloat32PubSubType::register_type_object_representation() AliasFloat64PubSubType::AliasFloat64PubSubType() { - setName("AliasFloat64"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasFloat64::getMaxCdrSerializedSize()); -#else - AliasFloat64_max_cdr_typesize; -#endif + set_name("AliasFloat64"); + uint32_t type_size = AliasFloat64_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasFloat64_max_key_cdr_typesize > 16 ? AliasFloat64_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasFloat64_max_key_cdr_typesize > 16 ? AliasFloat64_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasFloat64PubSubType::~AliasFloat64PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool AliasFloat64PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool AliasFloat64PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool AliasFloat64PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool AliasFloat64PubSubType::deserialize( return true; } -std::function AliasFloat64PubSubType::getSerializedSizeProvider( +uint32_t AliasFloat64PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasFloat64PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasFloat64PubSubType::create_data() { return reinterpret_cast(new AliasFloat64()); } -void AliasFloat64PubSubType::deleteData( +void AliasFloat64PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasFloat64PubSubType::getKey( +bool AliasFloat64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool AliasFloat64PubSubType::getKey( const AliasFloat64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasFloat64_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 || AliasFloat64_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void AliasFloat64PubSubType::register_type_object_representation() AliasFloat128PubSubType::AliasFloat128PubSubType() { - setName("AliasFloat128"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasFloat128::getMaxCdrSerializedSize()); -#else - AliasFloat128_max_cdr_typesize; -#endif + set_name("AliasFloat128"); + uint32_t type_size = AliasFloat128_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasFloat128_max_key_cdr_typesize > 16 ? AliasFloat128_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasFloat128_max_key_cdr_typesize > 16 ? AliasFloat128_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasFloat128PubSubType::~AliasFloat128PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool AliasFloat128PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool AliasFloat128PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool AliasFloat128PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool AliasFloat128PubSubType::deserialize( return true; } -std::function AliasFloat128PubSubType::getSerializedSizeProvider( +uint32_t AliasFloat128PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasFloat128PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasFloat128PubSubType::create_data() { return reinterpret_cast(new AliasFloat128()); } -void AliasFloat128PubSubType::deleteData( +void AliasFloat128PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasFloat128PubSubType::getKey( +bool AliasFloat128PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool AliasFloat128PubSubType::getKey( const AliasFloat128* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasFloat128_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 || AliasFloat128_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void AliasFloat128PubSubType::register_type_object_representation() AliasBoolPubSubType::AliasBoolPubSubType() { - setName("AliasBool"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasBool::getMaxCdrSerializedSize()); -#else - AliasBool_max_cdr_typesize; -#endif + set_name("AliasBool"); + uint32_t type_size = AliasBool_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasBool_max_key_cdr_typesize > 16 ? AliasBool_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasBool_max_key_cdr_typesize > 16 ? AliasBool_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasBoolPubSubType::~AliasBoolPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool AliasBoolPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool AliasBoolPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool AliasBoolPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool AliasBoolPubSubType::deserialize( return true; } -std::function AliasBoolPubSubType::getSerializedSizeProvider( +uint32_t AliasBoolPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasBoolPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasBoolPubSubType::create_data() { return reinterpret_cast(new AliasBool()); } -void AliasBoolPubSubType::deleteData( +void AliasBoolPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasBoolPubSubType::getKey( +bool AliasBoolPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool AliasBoolPubSubType::getKey( const AliasBool* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasBool_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 || AliasBool_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void AliasBoolPubSubType::register_type_object_representation() AliasOctetPubSubType::AliasOctetPubSubType() { - setName("AliasOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasOctet::getMaxCdrSerializedSize()); -#else - AliasOctet_max_cdr_typesize; -#endif + set_name("AliasOctet"); + uint32_t type_size = AliasOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasOctet_max_key_cdr_typesize > 16 ? AliasOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasOctet_max_key_cdr_typesize > 16 ? AliasOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasOctetPubSubType::~AliasOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool AliasOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool AliasOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool AliasOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool AliasOctetPubSubType::deserialize( return true; } -std::function AliasOctetPubSubType::getSerializedSizeProvider( +uint32_t AliasOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasOctetPubSubType::create_data() { return reinterpret_cast(new AliasOctet()); } -void AliasOctetPubSubType::deleteData( +void AliasOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasOctetPubSubType::getKey( +bool AliasOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool AliasOctetPubSubType::getKey( const AliasOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasOctet_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 || AliasOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void AliasOctetPubSubType::register_type_object_representation() AliasChar8PubSubType::AliasChar8PubSubType() { - setName("AliasChar8"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasChar8::getMaxCdrSerializedSize()); -#else - AliasChar8_max_cdr_typesize; -#endif + set_name("AliasChar8"); + uint32_t type_size = AliasChar8_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasChar8_max_key_cdr_typesize > 16 ? AliasChar8_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasChar8_max_key_cdr_typesize > 16 ? AliasChar8_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasChar8PubSubType::~AliasChar8PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool AliasChar8PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool AliasChar8PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool AliasChar8PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool AliasChar8PubSubType::deserialize( return true; } -std::function AliasChar8PubSubType::getSerializedSizeProvider( +uint32_t AliasChar8PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasChar8PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasChar8PubSubType::create_data() { return reinterpret_cast(new AliasChar8()); } -void AliasChar8PubSubType::deleteData( +void AliasChar8PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasChar8PubSubType::getKey( +bool AliasChar8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool AliasChar8PubSubType::getKey( const AliasChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasChar8_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 || AliasChar8_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void AliasChar8PubSubType::register_type_object_representation() AliasChar16PubSubType::AliasChar16PubSubType() { - setName("AliasChar16"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasChar16::getMaxCdrSerializedSize()); -#else - AliasChar16_max_cdr_typesize; -#endif + set_name("AliasChar16"); + uint32_t type_size = AliasChar16_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasChar16_max_key_cdr_typesize > 16 ? AliasChar16_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasChar16_max_key_cdr_typesize > 16 ? AliasChar16_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasChar16PubSubType::~AliasChar16PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool AliasChar16PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool AliasChar16PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool AliasChar16PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool AliasChar16PubSubType::deserialize( return true; } -std::function AliasChar16PubSubType::getSerializedSizeProvider( +uint32_t AliasChar16PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasChar16PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasChar16PubSubType::create_data() { return reinterpret_cast(new AliasChar16()); } -void AliasChar16PubSubType::deleteData( +void AliasChar16PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasChar16PubSubType::getKey( +bool AliasChar16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool AliasChar16PubSubType::getKey( const AliasChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasChar16_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 || AliasChar16_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void AliasChar16PubSubType::register_type_object_representation() AliasString8PubSubType::AliasString8PubSubType() { - setName("AliasString8"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasString8::getMaxCdrSerializedSize()); -#else - AliasString8_max_cdr_typesize; -#endif + set_name("AliasString8"); + uint32_t type_size = AliasString8_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasString8_max_key_cdr_typesize > 16 ? AliasString8_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasString8_max_key_cdr_typesize > 16 ? AliasString8_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasString8PubSubType::~AliasString8PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool AliasString8PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool AliasString8PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool AliasString8PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool AliasString8PubSubType::deserialize( return true; } -std::function AliasString8PubSubType::getSerializedSizeProvider( +uint32_t AliasString8PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasString8PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasString8PubSubType::create_data() { return reinterpret_cast(new AliasString8()); } -void AliasString8PubSubType::deleteData( +void AliasString8PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasString8PubSubType::getKey( +bool AliasString8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool AliasString8PubSubType::getKey( const AliasString8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasString8_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 || AliasString8_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void AliasString8PubSubType::register_type_object_representation() AliasString16PubSubType::AliasString16PubSubType() { - setName("AliasString16"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasString16::getMaxCdrSerializedSize()); -#else - AliasString16_max_cdr_typesize; -#endif + set_name("AliasString16"); + uint32_t type_size = AliasString16_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasString16_max_key_cdr_typesize > 16 ? AliasString16_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasString16_max_key_cdr_typesize > 16 ? AliasString16_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasString16PubSubType::~AliasString16PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool AliasString16PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool AliasString16PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool AliasString16PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool AliasString16PubSubType::deserialize( return true; } -std::function AliasString16PubSubType::getSerializedSizeProvider( +uint32_t AliasString16PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasString16PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasString16PubSubType::create_data() { return reinterpret_cast(new AliasString16()); } -void AliasString16PubSubType::deleteData( +void AliasString16PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasString16PubSubType::getKey( +bool AliasString16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool AliasString16PubSubType::getKey( const AliasString16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasString16_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 || AliasString16_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void AliasString16PubSubType::register_type_object_representation() AliasEnumPubSubType::AliasEnumPubSubType() { - setName("AliasEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasEnum::getMaxCdrSerializedSize()); -#else - AliasEnum_max_cdr_typesize; -#endif + set_name("AliasEnum"); + uint32_t type_size = AliasEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasEnum_max_key_cdr_typesize > 16 ? AliasEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasEnum_max_key_cdr_typesize > 16 ? AliasEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasEnumPubSubType::~AliasEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool AliasEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool AliasEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool AliasEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool AliasEnumPubSubType::deserialize( return true; } -std::function AliasEnumPubSubType::getSerializedSizeProvider( +uint32_t AliasEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasEnumPubSubType::create_data() { return reinterpret_cast(new AliasEnum()); } -void AliasEnumPubSubType::deleteData( +void AliasEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasEnumPubSubType::getKey( +bool AliasEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool AliasEnumPubSubType::getKey( const AliasEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasEnum_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 || AliasEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void AliasEnumPubSubType::register_type_object_representation() AliasBitmaskPubSubType::AliasBitmaskPubSubType() { - setName("AliasBitmask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasBitmask::getMaxCdrSerializedSize()); -#else - AliasBitmask_max_cdr_typesize; -#endif + set_name("AliasBitmask"); + uint32_t type_size = AliasBitmask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasBitmask_max_key_cdr_typesize > 16 ? AliasBitmask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasBitmask_max_key_cdr_typesize > 16 ? AliasBitmask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasBitmaskPubSubType::~AliasBitmaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool AliasBitmaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool AliasBitmaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool AliasBitmaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool AliasBitmaskPubSubType::deserialize( return true; } -std::function AliasBitmaskPubSubType::getSerializedSizeProvider( +uint32_t AliasBitmaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasBitmaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasBitmaskPubSubType::create_data() { return reinterpret_cast(new AliasBitmask()); } -void AliasBitmaskPubSubType::deleteData( +void AliasBitmaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasBitmaskPubSubType::getKey( +bool AliasBitmaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool AliasBitmaskPubSubType::getKey( const AliasBitmask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasBitmask_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 || AliasBitmask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void AliasBitmaskPubSubType::register_type_object_representation() AliasAliasPubSubType::AliasAliasPubSubType() { - setName("AliasAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasAlias::getMaxCdrSerializedSize()); -#else - AliasAlias_max_cdr_typesize; -#endif + set_name("AliasAlias"); + uint32_t type_size = AliasAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasAlias_max_key_cdr_typesize > 16 ? AliasAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasAlias_max_key_cdr_typesize > 16 ? AliasAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasAliasPubSubType::~AliasAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool AliasAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool AliasAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool AliasAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool AliasAliasPubSubType::deserialize( return true; } -std::function AliasAliasPubSubType::getSerializedSizeProvider( +uint32_t AliasAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasAliasPubSubType::create_data() { return reinterpret_cast(new AliasAlias()); } -void AliasAliasPubSubType::deleteData( +void AliasAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasAliasPubSubType::getKey( +bool AliasAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool AliasAliasPubSubType::getKey( const AliasAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasAlias_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 || AliasAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void AliasAliasPubSubType::register_type_object_representation() AliasArrayPubSubType::AliasArrayPubSubType() { - setName("AliasArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasArray::getMaxCdrSerializedSize()); -#else - AliasArray_max_cdr_typesize; -#endif + set_name("AliasArray"); + uint32_t type_size = AliasArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasArray_max_key_cdr_typesize > 16 ? AliasArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasArray_max_key_cdr_typesize > 16 ? AliasArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasArrayPubSubType::~AliasArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool AliasArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool AliasArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool AliasArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool AliasArrayPubSubType::deserialize( return true; } -std::function AliasArrayPubSubType::getSerializedSizeProvider( +uint32_t AliasArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasArrayPubSubType::create_data() { return reinterpret_cast(new AliasArray()); } -void AliasArrayPubSubType::deleteData( +void AliasArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasArrayPubSubType::getKey( +bool AliasArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool AliasArrayPubSubType::getKey( const AliasArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasArray_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 || AliasArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void AliasArrayPubSubType::register_type_object_representation() AliasMultiArrayPubSubType::AliasMultiArrayPubSubType() { - setName("AliasMultiArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasMultiArray::getMaxCdrSerializedSize()); -#else - AliasMultiArray_max_cdr_typesize; -#endif + set_name("AliasMultiArray"); + uint32_t type_size = AliasMultiArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasMultiArray_max_key_cdr_typesize > 16 ? AliasMultiArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasMultiArray_max_key_cdr_typesize > 16 ? AliasMultiArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasMultiArrayPubSubType::~AliasMultiArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool AliasMultiArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool AliasMultiArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool AliasMultiArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool AliasMultiArrayPubSubType::deserialize( return true; } -std::function AliasMultiArrayPubSubType::getSerializedSizeProvider( +uint32_t AliasMultiArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasMultiArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasMultiArrayPubSubType::create_data() { return reinterpret_cast(new AliasMultiArray()); } -void AliasMultiArrayPubSubType::deleteData( +void AliasMultiArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasMultiArrayPubSubType::getKey( +bool AliasMultiArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool AliasMultiArrayPubSubType::getKey( const AliasMultiArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasMultiArray_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 || AliasMultiArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void AliasMultiArrayPubSubType::register_type_object_representation() AliasSequencePubSubType::AliasSequencePubSubType() { - setName("AliasSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasSequence::getMaxCdrSerializedSize()); -#else - AliasSequence_max_cdr_typesize; -#endif + set_name("AliasSequence"); + uint32_t type_size = AliasSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasSequence_max_key_cdr_typesize > 16 ? AliasSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasSequence_max_key_cdr_typesize > 16 ? AliasSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasSequencePubSubType::~AliasSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool AliasSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool AliasSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool AliasSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool AliasSequencePubSubType::deserialize( return true; } -std::function AliasSequencePubSubType::getSerializedSizeProvider( +uint32_t AliasSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasSequencePubSubType::create_data() { return reinterpret_cast(new AliasSequence()); } -void AliasSequencePubSubType::deleteData( +void AliasSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasSequencePubSubType::getKey( +bool AliasSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool AliasSequencePubSubType::getKey( const AliasSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasSequence_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 || AliasSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void AliasSequencePubSubType::register_type_object_representation() AliasMapPubSubType::AliasMapPubSubType() { - setName("AliasMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasMap::getMaxCdrSerializedSize()); -#else - AliasMap_max_cdr_typesize; -#endif + set_name("AliasMap"); + uint32_t type_size = AliasMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasMap_max_key_cdr_typesize > 16 ? AliasMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasMap_max_key_cdr_typesize > 16 ? AliasMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasMapPubSubType::~AliasMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool AliasMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool AliasMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool AliasMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool AliasMapPubSubType::deserialize( return true; } -std::function AliasMapPubSubType::getSerializedSizeProvider( +uint32_t AliasMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasMapPubSubType::create_data() { return reinterpret_cast(new AliasMap()); } -void AliasMapPubSubType::deleteData( +void AliasMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasMapPubSubType::getKey( +bool AliasMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool AliasMapPubSubType::getKey( const AliasMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasMap_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 || AliasMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void AliasMapPubSubType::register_type_object_representation() AliasUnionPubSubType::AliasUnionPubSubType() { - setName("AliasUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasUnion::getMaxCdrSerializedSize()); -#else - AliasUnion_max_cdr_typesize; -#endif + set_name("AliasUnion"); + uint32_t type_size = AliasUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasUnion_max_key_cdr_typesize > 16 ? AliasUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasUnion_max_key_cdr_typesize > 16 ? AliasUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasUnionPubSubType::~AliasUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool AliasUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool AliasUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool AliasUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool AliasUnionPubSubType::deserialize( return true; } -std::function AliasUnionPubSubType::getSerializedSizeProvider( +uint32_t AliasUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasUnionPubSubType::create_data() { return reinterpret_cast(new AliasUnion()); } -void AliasUnionPubSubType::deleteData( +void AliasUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasUnionPubSubType::getKey( +bool AliasUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool AliasUnionPubSubType::getKey( const AliasUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasUnion_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 || AliasUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void AliasUnionPubSubType::register_type_object_representation() AliasStructPubSubType::AliasStructPubSubType() { - setName("AliasStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasStruct::getMaxCdrSerializedSize()); -#else - AliasStruct_max_cdr_typesize; -#endif + set_name("AliasStruct"); + uint32_t type_size = AliasStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasStruct_max_key_cdr_typesize > 16 ? AliasStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasStruct_max_key_cdr_typesize > 16 ? AliasStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasStructPubSubType::~AliasStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool AliasStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool AliasStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool AliasStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool AliasStructPubSubType::deserialize( return true; } -std::function AliasStructPubSubType::getSerializedSizeProvider( +uint32_t AliasStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasStructPubSubType::create_data() { return reinterpret_cast(new AliasStruct()); } -void AliasStructPubSubType::deleteData( +void AliasStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasStructPubSubType::getKey( +bool AliasStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool AliasStructPubSubType::getKey( const AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasStruct_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 || AliasStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void AliasStructPubSubType::register_type_object_representation() AliasBitsetPubSubType::AliasBitsetPubSubType() { - setName("AliasBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasBitset::getMaxCdrSerializedSize()); -#else - AliasBitset_max_cdr_typesize; -#endif + set_name("AliasBitset"); + uint32_t type_size = AliasBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasBitset_max_key_cdr_typesize > 16 ? AliasBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasBitset_max_key_cdr_typesize > 16 ? AliasBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasBitsetPubSubType::~AliasBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool AliasBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool AliasBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool AliasBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool AliasBitsetPubSubType::deserialize( return true; } -std::function AliasBitsetPubSubType::getSerializedSizeProvider( +uint32_t AliasBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AliasBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AliasBitsetPubSubType::create_data() { return reinterpret_cast(new AliasBitset()); } -void AliasBitsetPubSubType::deleteData( +void AliasBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasBitsetPubSubType::getKey( +bool AliasBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool AliasBitsetPubSubType::getKey( const AliasBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasBitset_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 || AliasBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index 3a3a410dcec..0e2a7acdbba 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -87,18 +87,18 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -133,8 +133,8 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -161,18 +161,18 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -207,8 +207,8 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -235,18 +235,18 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -281,8 +281,8 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -309,18 +309,18 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -355,8 +355,8 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -383,18 +383,18 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -429,8 +429,8 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -457,18 +457,18 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -503,8 +503,8 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -531,18 +531,18 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -577,8 +577,8 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -605,18 +605,18 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -651,8 +651,8 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -679,18 +679,18 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -725,8 +725,8 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -753,18 +753,18 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -799,8 +799,8 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -827,18 +827,18 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -873,8 +873,8 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -901,18 +901,18 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -947,8 +947,8 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -975,18 +975,18 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1021,8 +1021,8 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1049,18 +1049,18 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1095,8 +1095,8 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1123,18 +1123,18 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1169,8 +1169,8 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1197,18 +1197,18 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1243,8 +1243,8 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1271,18 +1271,18 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1317,8 +1317,8 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1345,18 +1345,18 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1391,8 +1391,8 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1419,18 +1419,18 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1465,8 +1465,8 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1493,18 +1493,18 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1539,8 +1539,8 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1567,18 +1567,18 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1613,8 +1613,8 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1641,18 +1641,18 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1687,8 +1687,8 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1715,18 +1715,18 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1761,8 +1761,8 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1789,18 +1789,18 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1835,8 +1835,8 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1863,18 +1863,18 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1909,8 +1909,8 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/annotationsPubSubTypes.cxx b/test/dds-types-test/annotationsPubSubTypes.cxx index eef736b5191..f1980d75efa 100644 --- a/test/dds-types-test/annotationsPubSubTypes.cxx +++ b/test/dds-types-test/annotationsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AnnotatedStructPubSubType::AnnotatedStructPubSubType() { - setName("AnnotatedStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AnnotatedStruct::getMaxCdrSerializedSize()); -#else - AnnotatedStruct_max_cdr_typesize; -#endif + set_name("AnnotatedStruct"); + uint32_t type_size = AnnotatedStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AnnotatedStruct_max_key_cdr_typesize > 16 ? AnnotatedStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AnnotatedStruct_max_key_cdr_typesize > 16 ? AnnotatedStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AnnotatedStructPubSubType::~AnnotatedStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool AnnotatedStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool AnnotatedStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool AnnotatedStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool AnnotatedStructPubSubType::deserialize( return true; } -std::function AnnotatedStructPubSubType::getSerializedSizeProvider( +uint32_t AnnotatedStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* AnnotatedStructPubSubType::createData() +void* AnnotatedStructPubSubType::create_data() { return reinterpret_cast(new AnnotatedStruct()); } -void AnnotatedStructPubSubType::deleteData( +void AnnotatedStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AnnotatedStructPubSubType::getKey( +bool AnnotatedStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool AnnotatedStructPubSubType::getKey( const AnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AnnotatedStruct_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 || AnnotatedStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void AnnotatedStructPubSubType::register_type_object_representation() EmptyAnnotatedStructPubSubType::EmptyAnnotatedStructPubSubType() { - setName("EmptyAnnotatedStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(EmptyAnnotatedStruct::getMaxCdrSerializedSize()); -#else - EmptyAnnotatedStruct_max_cdr_typesize; -#endif + set_name("EmptyAnnotatedStruct"); + uint32_t type_size = EmptyAnnotatedStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = EmptyAnnotatedStruct_max_key_cdr_typesize > 16 ? EmptyAnnotatedStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = EmptyAnnotatedStruct_max_key_cdr_typesize > 16 ? EmptyAnnotatedStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EmptyAnnotatedStructPubSubType::~EmptyAnnotatedStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool EmptyAnnotatedStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool EmptyAnnotatedStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool EmptyAnnotatedStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool EmptyAnnotatedStructPubSubType::deserialize( return true; } -std::function EmptyAnnotatedStructPubSubType::getSerializedSizeProvider( +uint32_t EmptyAnnotatedStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* EmptyAnnotatedStructPubSubType::createData() +void* EmptyAnnotatedStructPubSubType::create_data() { return reinterpret_cast(new EmptyAnnotatedStruct()); } -void EmptyAnnotatedStructPubSubType::deleteData( +void EmptyAnnotatedStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool EmptyAnnotatedStructPubSubType::getKey( +bool EmptyAnnotatedStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool EmptyAnnotatedStructPubSubType::getKey( const EmptyAnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), EmptyAnnotatedStruct_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 || EmptyAnnotatedStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -420,26 +356,21 @@ void EmptyAnnotatedStructPubSubType::register_type_object_representation() BasicAnnotationsStructPubSubType::BasicAnnotationsStructPubSubType() { - setName("BasicAnnotationsStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BasicAnnotationsStruct::getMaxCdrSerializedSize()); -#else - BasicAnnotationsStruct_max_cdr_typesize; -#endif + set_name("BasicAnnotationsStruct"); + uint32_t type_size = BasicAnnotationsStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BasicAnnotationsStruct_max_key_cdr_typesize > 16 ? BasicAnnotationsStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BasicAnnotationsStruct_max_key_cdr_typesize > 16 ? BasicAnnotationsStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BasicAnnotationsStructPubSubType::~BasicAnnotationsStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -457,12 +388,10 @@ bool BasicAnnotationsStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -477,11 +406,7 @@ bool BasicAnnotationsStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -498,11 +423,7 @@ bool BasicAnnotationsStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -519,52 +440,43 @@ bool BasicAnnotationsStructPubSubType::deserialize( return true; } -std::function BasicAnnotationsStructPubSubType::getSerializedSizeProvider( +uint32_t BasicAnnotationsStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BasicAnnotationsStructPubSubType::createData() +void* BasicAnnotationsStructPubSubType::create_data() { return reinterpret_cast(new BasicAnnotationsStruct()); } -void BasicAnnotationsStructPubSubType::deleteData( +void BasicAnnotationsStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BasicAnnotationsStructPubSubType::getKey( +bool BasicAnnotationsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -572,35 +484,27 @@ bool BasicAnnotationsStructPubSubType::getKey( const BasicAnnotationsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BasicAnnotationsStruct_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 || BasicAnnotationsStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index 1fdc2857aee..ed32a9effac 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -62,18 +62,18 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -211,18 +211,18 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -257,8 +257,8 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/appendablePubSubTypes.cxx b/test/dds-types-test/appendablePubSubTypes.cxx index 756bd87c45e..25d80f38c28 100644 --- a/test/dds-types-test/appendablePubSubTypes.cxx +++ b/test/dds-types-test/appendablePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AppendableShortStructPubSubType::AppendableShortStructPubSubType() { - setName("AppendableShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableShortStruct::getMaxCdrSerializedSize()); -#else - AppendableShortStruct_max_cdr_typesize; -#endif + set_name("AppendableShortStruct"); + uint32_t type_size = AppendableShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableShortStruct_max_key_cdr_typesize > 16 ? AppendableShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableShortStruct_max_key_cdr_typesize > 16 ? AppendableShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableShortStructPubSubType::~AppendableShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool AppendableShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool AppendableShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool AppendableShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool AppendableShortStructPubSubType::deserialize( return true; } -std::function AppendableShortStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableShortStructPubSubType::create_data() { return reinterpret_cast(new AppendableShortStruct()); } -void AppendableShortStructPubSubType::deleteData( +void AppendableShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableShortStructPubSubType::getKey( +bool AppendableShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool AppendableShortStructPubSubType::getKey( const AppendableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableShortStruct_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 || AppendableShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void AppendableShortStructPubSubType::register_type_object_representation() AppendableUShortStructPubSubType::AppendableUShortStructPubSubType() { - setName("AppendableUShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableUShortStruct::getMaxCdrSerializedSize()); -#else - AppendableUShortStruct_max_cdr_typesize; -#endif + set_name("AppendableUShortStruct"); + uint32_t type_size = AppendableUShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableUShortStruct_max_key_cdr_typesize > 16 ? AppendableUShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableUShortStruct_max_key_cdr_typesize > 16 ? AppendableUShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableUShortStructPubSubType::~AppendableUShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool AppendableUShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool AppendableUShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool AppendableUShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool AppendableUShortStructPubSubType::deserialize( return true; } -std::function AppendableUShortStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableUShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableUShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableUShortStructPubSubType::create_data() { return reinterpret_cast(new AppendableUShortStruct()); } -void AppendableUShortStructPubSubType::deleteData( +void AppendableUShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableUShortStructPubSubType::getKey( +bool AppendableUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool AppendableUShortStructPubSubType::getKey( const AppendableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableUShortStruct_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 || AppendableUShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void AppendableUShortStructPubSubType::register_type_object_representation() AppendableLongStructPubSubType::AppendableLongStructPubSubType() { - setName("AppendableLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableLongStruct::getMaxCdrSerializedSize()); -#else - AppendableLongStruct_max_cdr_typesize; -#endif + set_name("AppendableLongStruct"); + uint32_t type_size = AppendableLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableLongStruct_max_key_cdr_typesize > 16 ? AppendableLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableLongStruct_max_key_cdr_typesize > 16 ? AppendableLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableLongStructPubSubType::~AppendableLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool AppendableLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool AppendableLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool AppendableLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool AppendableLongStructPubSubType::deserialize( return true; } -std::function AppendableLongStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableLongStructPubSubType::create_data() { return reinterpret_cast(new AppendableLongStruct()); } -void AppendableLongStructPubSubType::deleteData( +void AppendableLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableLongStructPubSubType::getKey( +bool AppendableLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool AppendableLongStructPubSubType::getKey( const AppendableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableLongStruct_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 || AppendableLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void AppendableLongStructPubSubType::register_type_object_representation() AppendableULongStructPubSubType::AppendableULongStructPubSubType() { - setName("AppendableULongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableULongStruct::getMaxCdrSerializedSize()); -#else - AppendableULongStruct_max_cdr_typesize; -#endif + set_name("AppendableULongStruct"); + uint32_t type_size = AppendableULongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableULongStruct_max_key_cdr_typesize > 16 ? AppendableULongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableULongStruct_max_key_cdr_typesize > 16 ? AppendableULongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableULongStructPubSubType::~AppendableULongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool AppendableULongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool AppendableULongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool AppendableULongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool AppendableULongStructPubSubType::deserialize( return true; } -std::function AppendableULongStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableULongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableULongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableULongStructPubSubType::create_data() { return reinterpret_cast(new AppendableULongStruct()); } -void AppendableULongStructPubSubType::deleteData( +void AppendableULongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableULongStructPubSubType::getKey( +bool AppendableULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool AppendableULongStructPubSubType::getKey( const AppendableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableULongStruct_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 || AppendableULongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void AppendableULongStructPubSubType::register_type_object_representation() AppendableLongLongStructPubSubType::AppendableLongLongStructPubSubType() { - setName("AppendableLongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableLongLongStruct::getMaxCdrSerializedSize()); -#else - AppendableLongLongStruct_max_cdr_typesize; -#endif + set_name("AppendableLongLongStruct"); + uint32_t type_size = AppendableLongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableLongLongStruct_max_key_cdr_typesize > 16 ? AppendableLongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableLongLongStruct_max_key_cdr_typesize > 16 ? AppendableLongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableLongLongStructPubSubType::~AppendableLongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool AppendableLongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool AppendableLongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool AppendableLongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool AppendableLongLongStructPubSubType::deserialize( return true; } -std::function AppendableLongLongStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableLongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableLongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableLongLongStructPubSubType::create_data() { return reinterpret_cast(new AppendableLongLongStruct()); } -void AppendableLongLongStructPubSubType::deleteData( +void AppendableLongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableLongLongStructPubSubType::getKey( +bool AppendableLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool AppendableLongLongStructPubSubType::getKey( const AppendableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableLongLongStruct_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 || AppendableLongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void AppendableLongLongStructPubSubType::register_type_object_representation() AppendableULongLongStructPubSubType::AppendableULongLongStructPubSubType() { - setName("AppendableULongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableULongLongStruct::getMaxCdrSerializedSize()); -#else - AppendableULongLongStruct_max_cdr_typesize; -#endif + set_name("AppendableULongLongStruct"); + uint32_t type_size = AppendableULongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableULongLongStruct_max_key_cdr_typesize > 16 ? AppendableULongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableULongLongStruct_max_key_cdr_typesize > 16 ? AppendableULongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableULongLongStructPubSubType::~AppendableULongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool AppendableULongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool AppendableULongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool AppendableULongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool AppendableULongLongStructPubSubType::deserialize( return true; } -std::function AppendableULongLongStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableULongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableULongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableULongLongStructPubSubType::create_data() { return reinterpret_cast(new AppendableULongLongStruct()); } -void AppendableULongLongStructPubSubType::deleteData( +void AppendableULongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableULongLongStructPubSubType::getKey( +bool AppendableULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool AppendableULongLongStructPubSubType::getKey( const AppendableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableULongLongStruct_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 || AppendableULongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void AppendableULongLongStructPubSubType::register_type_object_representation() AppendableFloatStructPubSubType::AppendableFloatStructPubSubType() { - setName("AppendableFloatStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableFloatStruct::getMaxCdrSerializedSize()); -#else - AppendableFloatStruct_max_cdr_typesize; -#endif + set_name("AppendableFloatStruct"); + uint32_t type_size = AppendableFloatStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableFloatStruct_max_key_cdr_typesize > 16 ? AppendableFloatStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableFloatStruct_max_key_cdr_typesize > 16 ? AppendableFloatStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableFloatStructPubSubType::~AppendableFloatStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool AppendableFloatStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool AppendableFloatStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool AppendableFloatStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool AppendableFloatStructPubSubType::deserialize( return true; } -std::function AppendableFloatStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableFloatStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableFloatStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableFloatStructPubSubType::create_data() { return reinterpret_cast(new AppendableFloatStruct()); } -void AppendableFloatStructPubSubType::deleteData( +void AppendableFloatStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableFloatStructPubSubType::getKey( +bool AppendableFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool AppendableFloatStructPubSubType::getKey( const AppendableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableFloatStruct_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 || AppendableFloatStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void AppendableFloatStructPubSubType::register_type_object_representation() AppendableDoubleStructPubSubType::AppendableDoubleStructPubSubType() { - setName("AppendableDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableDoubleStruct::getMaxCdrSerializedSize()); -#else - AppendableDoubleStruct_max_cdr_typesize; -#endif + set_name("AppendableDoubleStruct"); + uint32_t type_size = AppendableDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableDoubleStruct_max_key_cdr_typesize > 16 ? AppendableDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableDoubleStruct_max_key_cdr_typesize > 16 ? AppendableDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableDoubleStructPubSubType::~AppendableDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool AppendableDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool AppendableDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool AppendableDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool AppendableDoubleStructPubSubType::deserialize( return true; } -std::function AppendableDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableDoubleStructPubSubType::create_data() { return reinterpret_cast(new AppendableDoubleStruct()); } -void AppendableDoubleStructPubSubType::deleteData( +void AppendableDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableDoubleStructPubSubType::getKey( +bool AppendableDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool AppendableDoubleStructPubSubType::getKey( const AppendableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableDoubleStruct_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 || AppendableDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void AppendableDoubleStructPubSubType::register_type_object_representation() AppendableLongDoubleStructPubSubType::AppendableLongDoubleStructPubSubType() { - setName("AppendableLongDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableLongDoubleStruct::getMaxCdrSerializedSize()); -#else - AppendableLongDoubleStruct_max_cdr_typesize; -#endif + set_name("AppendableLongDoubleStruct"); + uint32_t type_size = AppendableLongDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableLongDoubleStruct_max_key_cdr_typesize > 16 ? AppendableLongDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableLongDoubleStruct_max_key_cdr_typesize > 16 ? AppendableLongDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableLongDoubleStructPubSubType::~AppendableLongDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool AppendableLongDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool AppendableLongDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool AppendableLongDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool AppendableLongDoubleStructPubSubType::deserialize( return true; } -std::function AppendableLongDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableLongDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableLongDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableLongDoubleStructPubSubType::create_data() { return reinterpret_cast(new AppendableLongDoubleStruct()); } -void AppendableLongDoubleStructPubSubType::deleteData( +void AppendableLongDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableLongDoubleStructPubSubType::getKey( +bool AppendableLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool AppendableLongDoubleStructPubSubType::getKey( const AppendableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableLongDoubleStruct_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 || AppendableLongDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void AppendableLongDoubleStructPubSubType::register_type_object_representation() AppendableBooleanStructPubSubType::AppendableBooleanStructPubSubType() { - setName("AppendableBooleanStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableBooleanStruct::getMaxCdrSerializedSize()); -#else - AppendableBooleanStruct_max_cdr_typesize; -#endif + set_name("AppendableBooleanStruct"); + uint32_t type_size = AppendableBooleanStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableBooleanStruct_max_key_cdr_typesize > 16 ? AppendableBooleanStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableBooleanStruct_max_key_cdr_typesize > 16 ? AppendableBooleanStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableBooleanStructPubSubType::~AppendableBooleanStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool AppendableBooleanStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool AppendableBooleanStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool AppendableBooleanStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool AppendableBooleanStructPubSubType::deserialize( return true; } -std::function AppendableBooleanStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableBooleanStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableBooleanStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableBooleanStructPubSubType::create_data() { return reinterpret_cast(new AppendableBooleanStruct()); } -void AppendableBooleanStructPubSubType::deleteData( +void AppendableBooleanStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableBooleanStructPubSubType::getKey( +bool AppendableBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool AppendableBooleanStructPubSubType::getKey( const AppendableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableBooleanStruct_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 || AppendableBooleanStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void AppendableBooleanStructPubSubType::register_type_object_representation() AppendableOctetStructPubSubType::AppendableOctetStructPubSubType() { - setName("AppendableOctetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableOctetStruct::getMaxCdrSerializedSize()); -#else - AppendableOctetStruct_max_cdr_typesize; -#endif + set_name("AppendableOctetStruct"); + uint32_t type_size = AppendableOctetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableOctetStruct_max_key_cdr_typesize > 16 ? AppendableOctetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableOctetStruct_max_key_cdr_typesize > 16 ? AppendableOctetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableOctetStructPubSubType::~AppendableOctetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool AppendableOctetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool AppendableOctetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool AppendableOctetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool AppendableOctetStructPubSubType::deserialize( return true; } -std::function AppendableOctetStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableOctetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableOctetStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableOctetStructPubSubType::create_data() { return reinterpret_cast(new AppendableOctetStruct()); } -void AppendableOctetStructPubSubType::deleteData( +void AppendableOctetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableOctetStructPubSubType::getKey( +bool AppendableOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool AppendableOctetStructPubSubType::getKey( const AppendableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableOctetStruct_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 || AppendableOctetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void AppendableOctetStructPubSubType::register_type_object_representation() AppendableCharStructPubSubType::AppendableCharStructPubSubType() { - setName("AppendableCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableCharStruct::getMaxCdrSerializedSize()); -#else - AppendableCharStruct_max_cdr_typesize; -#endif + set_name("AppendableCharStruct"); + uint32_t type_size = AppendableCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableCharStruct_max_key_cdr_typesize > 16 ? AppendableCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableCharStruct_max_key_cdr_typesize > 16 ? AppendableCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableCharStructPubSubType::~AppendableCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool AppendableCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool AppendableCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool AppendableCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool AppendableCharStructPubSubType::deserialize( return true; } -std::function AppendableCharStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableCharStructPubSubType::create_data() { return reinterpret_cast(new AppendableCharStruct()); } -void AppendableCharStructPubSubType::deleteData( +void AppendableCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableCharStructPubSubType::getKey( +bool AppendableCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool AppendableCharStructPubSubType::getKey( const AppendableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableCharStruct_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 || AppendableCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void AppendableCharStructPubSubType::register_type_object_representation() AppendableWCharStructPubSubType::AppendableWCharStructPubSubType() { - setName("AppendableWCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableWCharStruct::getMaxCdrSerializedSize()); -#else - AppendableWCharStruct_max_cdr_typesize; -#endif + set_name("AppendableWCharStruct"); + uint32_t type_size = AppendableWCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableWCharStruct_max_key_cdr_typesize > 16 ? AppendableWCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableWCharStruct_max_key_cdr_typesize > 16 ? AppendableWCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableWCharStructPubSubType::~AppendableWCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool AppendableWCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool AppendableWCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool AppendableWCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool AppendableWCharStructPubSubType::deserialize( return true; } -std::function AppendableWCharStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableWCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableWCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableWCharStructPubSubType::create_data() { return reinterpret_cast(new AppendableWCharStruct()); } -void AppendableWCharStructPubSubType::deleteData( +void AppendableWCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableWCharStructPubSubType::getKey( +bool AppendableWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool AppendableWCharStructPubSubType::getKey( const AppendableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableWCharStruct_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 || AppendableWCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void AppendableWCharStructPubSubType::register_type_object_representation() AppendableUnionStructPubSubType::AppendableUnionStructPubSubType() { - setName("AppendableUnionStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableUnionStruct::getMaxCdrSerializedSize()); -#else - AppendableUnionStruct_max_cdr_typesize; -#endif + set_name("AppendableUnionStruct"); + uint32_t type_size = AppendableUnionStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableUnionStruct_max_key_cdr_typesize > 16 ? AppendableUnionStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableUnionStruct_max_key_cdr_typesize > 16 ? AppendableUnionStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableUnionStructPubSubType::~AppendableUnionStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool AppendableUnionStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool AppendableUnionStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool AppendableUnionStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool AppendableUnionStructPubSubType::deserialize( return true; } -std::function AppendableUnionStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableUnionStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableUnionStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableUnionStructPubSubType::create_data() { return reinterpret_cast(new AppendableUnionStruct()); } -void AppendableUnionStructPubSubType::deleteData( +void AppendableUnionStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableUnionStructPubSubType::getKey( +bool AppendableUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool AppendableUnionStructPubSubType::getKey( const AppendableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableUnionStruct_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 || AppendableUnionStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void AppendableUnionStructPubSubType::register_type_object_representation() AppendableEmptyStructPubSubType::AppendableEmptyStructPubSubType() { - setName("AppendableEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableEmptyStruct::getMaxCdrSerializedSize()); -#else - AppendableEmptyStruct_max_cdr_typesize; -#endif + set_name("AppendableEmptyStruct"); + uint32_t type_size = AppendableEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableEmptyStruct_max_key_cdr_typesize > 16 ? AppendableEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableEmptyStruct_max_key_cdr_typesize > 16 ? AppendableEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableEmptyStructPubSubType::~AppendableEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool AppendableEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool AppendableEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool AppendableEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool AppendableEmptyStructPubSubType::deserialize( return true; } -std::function AppendableEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableEmptyStructPubSubType::create_data() { return reinterpret_cast(new AppendableEmptyStruct()); } -void AppendableEmptyStructPubSubType::deleteData( +void AppendableEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableEmptyStructPubSubType::getKey( +bool AppendableEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool AppendableEmptyStructPubSubType::getKey( const AppendableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableEmptyStruct_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 || AppendableEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void AppendableEmptyStructPubSubType::register_type_object_representation() AppendableEmptyInheritanceStructPubSubType::AppendableEmptyInheritanceStructPubSubType() { - setName("AppendableEmptyInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableEmptyInheritanceStruct::getMaxCdrSerializedSize()); -#else - AppendableEmptyInheritanceStruct_max_cdr_typesize; -#endif + set_name("AppendableEmptyInheritanceStruct"); + uint32_t type_size = AppendableEmptyInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? AppendableEmptyInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? AppendableEmptyInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableEmptyInheritanceStructPubSubType::~AppendableEmptyInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool AppendableEmptyInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool AppendableEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool AppendableEmptyInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool AppendableEmptyInheritanceStructPubSubType::deserialize( return true; } -std::function AppendableEmptyInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableEmptyInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableEmptyInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableEmptyInheritanceStructPubSubType::create_data() { return reinterpret_cast(new AppendableEmptyInheritanceStruct()); } -void AppendableEmptyInheritanceStructPubSubType::deleteData( +void AppendableEmptyInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableEmptyInheritanceStructPubSubType::getKey( +bool AppendableEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool AppendableEmptyInheritanceStructPubSubType::getKey( const AppendableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableEmptyInheritanceStruct_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 || AppendableEmptyInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void AppendableEmptyInheritanceStructPubSubType::register_type_object_representa AppendableInheritanceStructPubSubType::AppendableInheritanceStructPubSubType() { - setName("AppendableInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableInheritanceStruct::getMaxCdrSerializedSize()); -#else - AppendableInheritanceStruct_max_cdr_typesize; -#endif + set_name("AppendableInheritanceStruct"); + uint32_t type_size = AppendableInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableInheritanceStruct_max_key_cdr_typesize > 16 ? AppendableInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableInheritanceStruct_max_key_cdr_typesize > 16 ? AppendableInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableInheritanceStructPubSubType::~AppendableInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool AppendableInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool AppendableInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool AppendableInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool AppendableInheritanceStructPubSubType::deserialize( return true; } -std::function AppendableInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableInheritanceStructPubSubType::create_data() { return reinterpret_cast(new AppendableInheritanceStruct()); } -void AppendableInheritanceStructPubSubType::deleteData( +void AppendableInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableInheritanceStructPubSubType::getKey( +bool AppendableInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool AppendableInheritanceStructPubSubType::getKey( const AppendableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableInheritanceStruct_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 || AppendableInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void AppendableInheritanceStructPubSubType::register_type_object_representation( AppendableInheritanceEmptyStructPubSubType::AppendableInheritanceEmptyStructPubSubType() { - setName("AppendableInheritanceEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableInheritanceEmptyStruct::getMaxCdrSerializedSize()); -#else - AppendableInheritanceEmptyStruct_max_cdr_typesize; -#endif + set_name("AppendableInheritanceEmptyStruct"); + uint32_t type_size = AppendableInheritanceEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableInheritanceEmptyStruct_max_key_cdr_typesize > 16 ? AppendableInheritanceEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableInheritanceEmptyStruct_max_key_cdr_typesize > 16 ? AppendableInheritanceEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableInheritanceEmptyStructPubSubType::~AppendableInheritanceEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool AppendableInheritanceEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool AppendableInheritanceEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool AppendableInheritanceEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool AppendableInheritanceEmptyStructPubSubType::deserialize( return true; } -std::function AppendableInheritanceEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableInheritanceEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableInheritanceEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableInheritanceEmptyStructPubSubType::create_data() { return reinterpret_cast(new AppendableInheritanceEmptyStruct()); } -void AppendableInheritanceEmptyStructPubSubType::deleteData( +void AppendableInheritanceEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableInheritanceEmptyStructPubSubType::getKey( +bool AppendableInheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool AppendableInheritanceEmptyStructPubSubType::getKey( const AppendableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableInheritanceEmptyStruct_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 || AppendableInheritanceEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void AppendableInheritanceEmptyStructPubSubType::register_type_object_representa AppendableExtensibilityInheritancePubSubType::AppendableExtensibilityInheritancePubSubType() { - setName("AppendableExtensibilityInheritance"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableExtensibilityInheritance::getMaxCdrSerializedSize()); -#else - AppendableExtensibilityInheritance_max_cdr_typesize; -#endif + set_name("AppendableExtensibilityInheritance"); + uint32_t type_size = AppendableExtensibilityInheritance_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableExtensibilityInheritance_max_key_cdr_typesize > 16 ? AppendableExtensibilityInheritance_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableExtensibilityInheritance_max_key_cdr_typesize > 16 ? AppendableExtensibilityInheritance_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableExtensibilityInheritancePubSubType::~AppendableExtensibilityInheritancePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool AppendableExtensibilityInheritancePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool AppendableExtensibilityInheritancePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool AppendableExtensibilityInheritancePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool AppendableExtensibilityInheritancePubSubType::deserialize( return true; } -std::function AppendableExtensibilityInheritancePubSubType::getSerializedSizeProvider( +uint32_t AppendableExtensibilityInheritancePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableExtensibilityInheritancePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableExtensibilityInheritancePubSubType::create_data() { return reinterpret_cast(new AppendableExtensibilityInheritance()); } -void AppendableExtensibilityInheritancePubSubType::deleteData( +void AppendableExtensibilityInheritancePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableExtensibilityInheritancePubSubType::getKey( +bool AppendableExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool AppendableExtensibilityInheritancePubSubType::getKey( const AppendableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableExtensibilityInheritance_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 || AppendableExtensibilityInheritance_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index 158de9e14c2..d581d282b5a 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -62,18 +62,18 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/arraysPubSubTypes.cxx b/test/dds-types-test/arraysPubSubTypes.cxx index a9f432fe07c..cf0220e01b4 100644 --- a/test/dds-types-test/arraysPubSubTypes.cxx +++ b/test/dds-types-test/arraysPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ArrayShortPubSubType::ArrayShortPubSubType() { - setName("ArrayShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayShort::getMaxCdrSerializedSize()); -#else - ArrayShort_max_cdr_typesize; -#endif + set_name("ArrayShort"); + uint32_t type_size = ArrayShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayShort_max_key_cdr_typesize > 16 ? ArrayShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayShort_max_key_cdr_typesize > 16 ? ArrayShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayShortPubSubType::~ArrayShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool ArrayShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool ArrayShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool ArrayShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool ArrayShortPubSubType::deserialize( return true; } -std::function ArrayShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayShortPubSubType::create_data() { return reinterpret_cast(new ArrayShort()); } -void ArrayShortPubSubType::deleteData( +void ArrayShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayShortPubSubType::getKey( +bool ArrayShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool ArrayShortPubSubType::getKey( const ArrayShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayShort_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 || ArrayShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void ArrayShortPubSubType::register_type_object_representation() ArrayUShortPubSubType::ArrayUShortPubSubType() { - setName("ArrayUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayUShort::getMaxCdrSerializedSize()); -#else - ArrayUShort_max_cdr_typesize; -#endif + set_name("ArrayUShort"); + uint32_t type_size = ArrayUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayUShort_max_key_cdr_typesize > 16 ? ArrayUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayUShort_max_key_cdr_typesize > 16 ? ArrayUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayUShortPubSubType::~ArrayUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool ArrayUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool ArrayUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool ArrayUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool ArrayUShortPubSubType::deserialize( return true; } -std::function ArrayUShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayUShortPubSubType::create_data() { return reinterpret_cast(new ArrayUShort()); } -void ArrayUShortPubSubType::deleteData( +void ArrayUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayUShortPubSubType::getKey( +bool ArrayUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool ArrayUShortPubSubType::getKey( const ArrayUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayUShort_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 || ArrayUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void ArrayUShortPubSubType::register_type_object_representation() ArrayLongPubSubType::ArrayLongPubSubType() { - setName("ArrayLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayLong::getMaxCdrSerializedSize()); -#else - ArrayLong_max_cdr_typesize; -#endif + set_name("ArrayLong"); + uint32_t type_size = ArrayLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayLong_max_key_cdr_typesize > 16 ? ArrayLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayLong_max_key_cdr_typesize > 16 ? ArrayLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayLongPubSubType::~ArrayLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool ArrayLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool ArrayLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool ArrayLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool ArrayLongPubSubType::deserialize( return true; } -std::function ArrayLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayLongPubSubType::create_data() { return reinterpret_cast(new ArrayLong()); } -void ArrayLongPubSubType::deleteData( +void ArrayLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayLongPubSubType::getKey( +bool ArrayLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool ArrayLongPubSubType::getKey( const ArrayLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayLong_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 || ArrayLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void ArrayLongPubSubType::register_type_object_representation() ArrayULongPubSubType::ArrayULongPubSubType() { - setName("ArrayULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayULong::getMaxCdrSerializedSize()); -#else - ArrayULong_max_cdr_typesize; -#endif + set_name("ArrayULong"); + uint32_t type_size = ArrayULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayULong_max_key_cdr_typesize > 16 ? ArrayULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayULong_max_key_cdr_typesize > 16 ? ArrayULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayULongPubSubType::~ArrayULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool ArrayULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool ArrayULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool ArrayULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool ArrayULongPubSubType::deserialize( return true; } -std::function ArrayULongPubSubType::getSerializedSizeProvider( +uint32_t ArrayULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayULongPubSubType::create_data() { return reinterpret_cast(new ArrayULong()); } -void ArrayULongPubSubType::deleteData( +void ArrayULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayULongPubSubType::getKey( +bool ArrayULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool ArrayULongPubSubType::getKey( const ArrayULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayULong_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 || ArrayULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void ArrayULongPubSubType::register_type_object_representation() ArrayLongLongPubSubType::ArrayLongLongPubSubType() { - setName("ArrayLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayLongLong::getMaxCdrSerializedSize()); -#else - ArrayLongLong_max_cdr_typesize; -#endif + set_name("ArrayLongLong"); + uint32_t type_size = ArrayLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayLongLong_max_key_cdr_typesize > 16 ? ArrayLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayLongLong_max_key_cdr_typesize > 16 ? ArrayLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayLongLongPubSubType::~ArrayLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool ArrayLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool ArrayLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool ArrayLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool ArrayLongLongPubSubType::deserialize( return true; } -std::function ArrayLongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayLongLongPubSubType::create_data() { return reinterpret_cast(new ArrayLongLong()); } -void ArrayLongLongPubSubType::deleteData( +void ArrayLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayLongLongPubSubType::getKey( +bool ArrayLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool ArrayLongLongPubSubType::getKey( const ArrayLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayLongLong_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 || ArrayLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void ArrayLongLongPubSubType::register_type_object_representation() ArrayULongLongPubSubType::ArrayULongLongPubSubType() { - setName("ArrayULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayULongLong::getMaxCdrSerializedSize()); -#else - ArrayULongLong_max_cdr_typesize; -#endif + set_name("ArrayULongLong"); + uint32_t type_size = ArrayULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayULongLong_max_key_cdr_typesize > 16 ? ArrayULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayULongLong_max_key_cdr_typesize > 16 ? ArrayULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayULongLongPubSubType::~ArrayULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool ArrayULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool ArrayULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool ArrayULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool ArrayULongLongPubSubType::deserialize( return true; } -std::function ArrayULongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayULongLongPubSubType::create_data() { return reinterpret_cast(new ArrayULongLong()); } -void ArrayULongLongPubSubType::deleteData( +void ArrayULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayULongLongPubSubType::getKey( +bool ArrayULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool ArrayULongLongPubSubType::getKey( const ArrayULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayULongLong_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 || ArrayULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void ArrayULongLongPubSubType::register_type_object_representation() ArrayFloatPubSubType::ArrayFloatPubSubType() { - setName("ArrayFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayFloat::getMaxCdrSerializedSize()); -#else - ArrayFloat_max_cdr_typesize; -#endif + set_name("ArrayFloat"); + uint32_t type_size = ArrayFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayFloat_max_key_cdr_typesize > 16 ? ArrayFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayFloat_max_key_cdr_typesize > 16 ? ArrayFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayFloatPubSubType::~ArrayFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool ArrayFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool ArrayFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool ArrayFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool ArrayFloatPubSubType::deserialize( return true; } -std::function ArrayFloatPubSubType::getSerializedSizeProvider( +uint32_t ArrayFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayFloatPubSubType::create_data() { return reinterpret_cast(new ArrayFloat()); } -void ArrayFloatPubSubType::deleteData( +void ArrayFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayFloatPubSubType::getKey( +bool ArrayFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool ArrayFloatPubSubType::getKey( const ArrayFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayFloat_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 || ArrayFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void ArrayFloatPubSubType::register_type_object_representation() ArrayDoublePubSubType::ArrayDoublePubSubType() { - setName("ArrayDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayDouble::getMaxCdrSerializedSize()); -#else - ArrayDouble_max_cdr_typesize; -#endif + set_name("ArrayDouble"); + uint32_t type_size = ArrayDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayDouble_max_key_cdr_typesize > 16 ? ArrayDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayDouble_max_key_cdr_typesize > 16 ? ArrayDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayDoublePubSubType::~ArrayDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool ArrayDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool ArrayDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool ArrayDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool ArrayDoublePubSubType::deserialize( return true; } -std::function ArrayDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayDoublePubSubType::create_data() { return reinterpret_cast(new ArrayDouble()); } -void ArrayDoublePubSubType::deleteData( +void ArrayDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayDoublePubSubType::getKey( +bool ArrayDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool ArrayDoublePubSubType::getKey( const ArrayDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayDouble_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 || ArrayDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void ArrayDoublePubSubType::register_type_object_representation() ArrayLongDoublePubSubType::ArrayLongDoublePubSubType() { - setName("ArrayLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayLongDouble::getMaxCdrSerializedSize()); -#else - ArrayLongDouble_max_cdr_typesize; -#endif + set_name("ArrayLongDouble"); + uint32_t type_size = ArrayLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayLongDouble_max_key_cdr_typesize > 16 ? ArrayLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayLongDouble_max_key_cdr_typesize > 16 ? ArrayLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayLongDoublePubSubType::~ArrayLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool ArrayLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool ArrayLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool ArrayLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool ArrayLongDoublePubSubType::deserialize( return true; } -std::function ArrayLongDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayLongDoublePubSubType::create_data() { return reinterpret_cast(new ArrayLongDouble()); } -void ArrayLongDoublePubSubType::deleteData( +void ArrayLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayLongDoublePubSubType::getKey( +bool ArrayLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool ArrayLongDoublePubSubType::getKey( const ArrayLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayLongDouble_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 || ArrayLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void ArrayLongDoublePubSubType::register_type_object_representation() ArrayBooleanPubSubType::ArrayBooleanPubSubType() { - setName("ArrayBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayBoolean::getMaxCdrSerializedSize()); -#else - ArrayBoolean_max_cdr_typesize; -#endif + set_name("ArrayBoolean"); + uint32_t type_size = ArrayBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayBoolean_max_key_cdr_typesize > 16 ? ArrayBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayBoolean_max_key_cdr_typesize > 16 ? ArrayBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayBooleanPubSubType::~ArrayBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool ArrayBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool ArrayBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool ArrayBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool ArrayBooleanPubSubType::deserialize( return true; } -std::function ArrayBooleanPubSubType::getSerializedSizeProvider( +uint32_t ArrayBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayBooleanPubSubType::create_data() { return reinterpret_cast(new ArrayBoolean()); } -void ArrayBooleanPubSubType::deleteData( +void ArrayBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayBooleanPubSubType::getKey( +bool ArrayBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool ArrayBooleanPubSubType::getKey( const ArrayBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayBoolean_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 || ArrayBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void ArrayBooleanPubSubType::register_type_object_representation() ArrayOctetPubSubType::ArrayOctetPubSubType() { - setName("ArrayOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayOctet::getMaxCdrSerializedSize()); -#else - ArrayOctet_max_cdr_typesize; -#endif + set_name("ArrayOctet"); + uint32_t type_size = ArrayOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayOctet_max_key_cdr_typesize > 16 ? ArrayOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayOctet_max_key_cdr_typesize > 16 ? ArrayOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayOctetPubSubType::~ArrayOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool ArrayOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool ArrayOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool ArrayOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool ArrayOctetPubSubType::deserialize( return true; } -std::function ArrayOctetPubSubType::getSerializedSizeProvider( +uint32_t ArrayOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayOctetPubSubType::create_data() { return reinterpret_cast(new ArrayOctet()); } -void ArrayOctetPubSubType::deleteData( +void ArrayOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayOctetPubSubType::getKey( +bool ArrayOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool ArrayOctetPubSubType::getKey( const ArrayOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayOctet_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 || ArrayOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void ArrayOctetPubSubType::register_type_object_representation() ArrayCharPubSubType::ArrayCharPubSubType() { - setName("ArrayChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayChar::getMaxCdrSerializedSize()); -#else - ArrayChar_max_cdr_typesize; -#endif + set_name("ArrayChar"); + uint32_t type_size = ArrayChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayChar_max_key_cdr_typesize > 16 ? ArrayChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayChar_max_key_cdr_typesize > 16 ? ArrayChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayCharPubSubType::~ArrayCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool ArrayCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool ArrayCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool ArrayCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool ArrayCharPubSubType::deserialize( return true; } -std::function ArrayCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayCharPubSubType::create_data() { return reinterpret_cast(new ArrayChar()); } -void ArrayCharPubSubType::deleteData( +void ArrayCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayCharPubSubType::getKey( +bool ArrayCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool ArrayCharPubSubType::getKey( const ArrayChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayChar_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 || ArrayChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void ArrayCharPubSubType::register_type_object_representation() ArrayWCharPubSubType::ArrayWCharPubSubType() { - setName("ArrayWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayWChar::getMaxCdrSerializedSize()); -#else - ArrayWChar_max_cdr_typesize; -#endif + set_name("ArrayWChar"); + uint32_t type_size = ArrayWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayWChar_max_key_cdr_typesize > 16 ? ArrayWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayWChar_max_key_cdr_typesize > 16 ? ArrayWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayWCharPubSubType::~ArrayWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool ArrayWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool ArrayWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool ArrayWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool ArrayWCharPubSubType::deserialize( return true; } -std::function ArrayWCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayWCharPubSubType::create_data() { return reinterpret_cast(new ArrayWChar()); } -void ArrayWCharPubSubType::deleteData( +void ArrayWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayWCharPubSubType::getKey( +bool ArrayWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool ArrayWCharPubSubType::getKey( const ArrayWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayWChar_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 || ArrayWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void ArrayWCharPubSubType::register_type_object_representation() ArrayStringPubSubType::ArrayStringPubSubType() { - setName("ArrayString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayString::getMaxCdrSerializedSize()); -#else - ArrayString_max_cdr_typesize; -#endif + set_name("ArrayString"); + uint32_t type_size = ArrayString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayString_max_key_cdr_typesize > 16 ? ArrayString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayString_max_key_cdr_typesize > 16 ? ArrayString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayStringPubSubType::~ArrayStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool ArrayStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool ArrayStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool ArrayStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool ArrayStringPubSubType::deserialize( return true; } -std::function ArrayStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayStringPubSubType::create_data() { return reinterpret_cast(new ArrayString()); } -void ArrayStringPubSubType::deleteData( +void ArrayStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayStringPubSubType::getKey( +bool ArrayStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool ArrayStringPubSubType::getKey( const ArrayString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayString_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 || ArrayString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void ArrayStringPubSubType::register_type_object_representation() ArrayWStringPubSubType::ArrayWStringPubSubType() { - setName("ArrayWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayWString::getMaxCdrSerializedSize()); -#else - ArrayWString_max_cdr_typesize; -#endif + set_name("ArrayWString"); + uint32_t type_size = ArrayWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayWString_max_key_cdr_typesize > 16 ? ArrayWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayWString_max_key_cdr_typesize > 16 ? ArrayWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayWStringPubSubType::~ArrayWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool ArrayWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool ArrayWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool ArrayWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool ArrayWStringPubSubType::deserialize( return true; } -std::function ArrayWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayWStringPubSubType::create_data() { return reinterpret_cast(new ArrayWString()); } -void ArrayWStringPubSubType::deleteData( +void ArrayWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayWStringPubSubType::getKey( +bool ArrayWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool ArrayWStringPubSubType::getKey( const ArrayWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayWString_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 || ArrayWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void ArrayWStringPubSubType::register_type_object_representation() ArrayBoundedStringPubSubType::ArrayBoundedStringPubSubType() { - setName("ArrayBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayBoundedString::getMaxCdrSerializedSize()); -#else - ArrayBoundedString_max_cdr_typesize; -#endif + set_name("ArrayBoundedString"); + uint32_t type_size = ArrayBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayBoundedString_max_key_cdr_typesize > 16 ? ArrayBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayBoundedString_max_key_cdr_typesize > 16 ? ArrayBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayBoundedStringPubSubType::~ArrayBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool ArrayBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool ArrayBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool ArrayBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool ArrayBoundedStringPubSubType::deserialize( return true; } -std::function ArrayBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayBoundedStringPubSubType::create_data() { return reinterpret_cast(new ArrayBoundedString()); } -void ArrayBoundedStringPubSubType::deleteData( +void ArrayBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayBoundedStringPubSubType::getKey( +bool ArrayBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool ArrayBoundedStringPubSubType::getKey( const ArrayBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayBoundedString_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 || ArrayBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void ArrayBoundedStringPubSubType::register_type_object_representation() ArrayBoundedWStringPubSubType::ArrayBoundedWStringPubSubType() { - setName("ArrayBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayBoundedWString::getMaxCdrSerializedSize()); -#else - ArrayBoundedWString_max_cdr_typesize; -#endif + set_name("ArrayBoundedWString"); + uint32_t type_size = ArrayBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayBoundedWString_max_key_cdr_typesize > 16 ? ArrayBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayBoundedWString_max_key_cdr_typesize > 16 ? ArrayBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayBoundedWStringPubSubType::~ArrayBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool ArrayBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool ArrayBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool ArrayBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool ArrayBoundedWStringPubSubType::deserialize( return true; } -std::function ArrayBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayBoundedWStringPubSubType::create_data() { return reinterpret_cast(new ArrayBoundedWString()); } -void ArrayBoundedWStringPubSubType::deleteData( +void ArrayBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayBoundedWStringPubSubType::getKey( +bool ArrayBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool ArrayBoundedWStringPubSubType::getKey( const ArrayBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayBoundedWString_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 || ArrayBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void ArrayBoundedWStringPubSubType::register_type_object_representation() ArrayEnumPubSubType::ArrayEnumPubSubType() { - setName("ArrayEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayEnum::getMaxCdrSerializedSize()); -#else - ArrayEnum_max_cdr_typesize; -#endif + set_name("ArrayEnum"); + uint32_t type_size = ArrayEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayEnum_max_key_cdr_typesize > 16 ? ArrayEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayEnum_max_key_cdr_typesize > 16 ? ArrayEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayEnumPubSubType::~ArrayEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool ArrayEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool ArrayEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool ArrayEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool ArrayEnumPubSubType::deserialize( return true; } -std::function ArrayEnumPubSubType::getSerializedSizeProvider( +uint32_t ArrayEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayEnumPubSubType::create_data() { return reinterpret_cast(new ArrayEnum()); } -void ArrayEnumPubSubType::deleteData( +void ArrayEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayEnumPubSubType::getKey( +bool ArrayEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool ArrayEnumPubSubType::getKey( const ArrayEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayEnum_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 || ArrayEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void ArrayEnumPubSubType::register_type_object_representation() ArrayBitMaskPubSubType::ArrayBitMaskPubSubType() { - setName("ArrayBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayBitMask::getMaxCdrSerializedSize()); -#else - ArrayBitMask_max_cdr_typesize; -#endif + set_name("ArrayBitMask"); + uint32_t type_size = ArrayBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayBitMask_max_key_cdr_typesize > 16 ? ArrayBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayBitMask_max_key_cdr_typesize > 16 ? ArrayBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayBitMaskPubSubType::~ArrayBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool ArrayBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool ArrayBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool ArrayBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool ArrayBitMaskPubSubType::deserialize( return true; } -std::function ArrayBitMaskPubSubType::getSerializedSizeProvider( +uint32_t ArrayBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayBitMaskPubSubType::create_data() { return reinterpret_cast(new ArrayBitMask()); } -void ArrayBitMaskPubSubType::deleteData( +void ArrayBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayBitMaskPubSubType::getKey( +bool ArrayBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool ArrayBitMaskPubSubType::getKey( const ArrayBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayBitMask_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 || ArrayBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void ArrayBitMaskPubSubType::register_type_object_representation() ArrayAliasPubSubType::ArrayAliasPubSubType() { - setName("ArrayAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayAlias::getMaxCdrSerializedSize()); -#else - ArrayAlias_max_cdr_typesize; -#endif + set_name("ArrayAlias"); + uint32_t type_size = ArrayAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayAlias_max_key_cdr_typesize > 16 ? ArrayAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayAlias_max_key_cdr_typesize > 16 ? ArrayAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayAliasPubSubType::~ArrayAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool ArrayAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool ArrayAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool ArrayAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool ArrayAliasPubSubType::deserialize( return true; } -std::function ArrayAliasPubSubType::getSerializedSizeProvider( +uint32_t ArrayAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayAliasPubSubType::create_data() { return reinterpret_cast(new ArrayAlias()); } -void ArrayAliasPubSubType::deleteData( +void ArrayAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayAliasPubSubType::getKey( +bool ArrayAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool ArrayAliasPubSubType::getKey( const ArrayAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayAlias_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 || ArrayAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void ArrayAliasPubSubType::register_type_object_representation() ArrayShortArrayPubSubType::ArrayShortArrayPubSubType() { - setName("ArrayShortArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayShortArray::getMaxCdrSerializedSize()); -#else - ArrayShortArray_max_cdr_typesize; -#endif + set_name("ArrayShortArray"); + uint32_t type_size = ArrayShortArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayShortArray_max_key_cdr_typesize > 16 ? ArrayShortArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayShortArray_max_key_cdr_typesize > 16 ? ArrayShortArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayShortArrayPubSubType::~ArrayShortArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool ArrayShortArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool ArrayShortArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool ArrayShortArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool ArrayShortArrayPubSubType::deserialize( return true; } -std::function ArrayShortArrayPubSubType::getSerializedSizeProvider( +uint32_t ArrayShortArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayShortArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayShortArrayPubSubType::create_data() { return reinterpret_cast(new ArrayShortArray()); } -void ArrayShortArrayPubSubType::deleteData( +void ArrayShortArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayShortArrayPubSubType::getKey( +bool ArrayShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool ArrayShortArrayPubSubType::getKey( const ArrayShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayShortArray_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 || ArrayShortArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void ArrayShortArrayPubSubType::register_type_object_representation() ArraySequencePubSubType::ArraySequencePubSubType() { - setName("ArraySequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySequence::getMaxCdrSerializedSize()); -#else - ArraySequence_max_cdr_typesize; -#endif + set_name("ArraySequence"); + uint32_t type_size = ArraySequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySequence_max_key_cdr_typesize > 16 ? ArraySequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySequence_max_key_cdr_typesize > 16 ? ArraySequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySequencePubSubType::~ArraySequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool ArraySequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool ArraySequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool ArraySequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool ArraySequencePubSubType::deserialize( return true; } -std::function ArraySequencePubSubType::getSerializedSizeProvider( +uint32_t ArraySequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySequencePubSubType::create_data() { return reinterpret_cast(new ArraySequence()); } -void ArraySequencePubSubType::deleteData( +void ArraySequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySequencePubSubType::getKey( +bool ArraySequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool ArraySequencePubSubType::getKey( const ArraySequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySequence_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 || ArraySequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void ArraySequencePubSubType::register_type_object_representation() ArrayMapPubSubType::ArrayMapPubSubType() { - setName("ArrayMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMap::getMaxCdrSerializedSize()); -#else - ArrayMap_max_cdr_typesize; -#endif + set_name("ArrayMap"); + uint32_t type_size = ArrayMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMap_max_key_cdr_typesize > 16 ? ArrayMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMap_max_key_cdr_typesize > 16 ? ArrayMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMapPubSubType::~ArrayMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool ArrayMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool ArrayMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool ArrayMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool ArrayMapPubSubType::deserialize( return true; } -std::function ArrayMapPubSubType::getSerializedSizeProvider( +uint32_t ArrayMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMapPubSubType::create_data() { return reinterpret_cast(new ArrayMap()); } -void ArrayMapPubSubType::deleteData( +void ArrayMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMapPubSubType::getKey( +bool ArrayMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool ArrayMapPubSubType::getKey( const ArrayMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMap_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 || ArrayMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void ArrayMapPubSubType::register_type_object_representation() ArrayUnionPubSubType::ArrayUnionPubSubType() { - setName("ArrayUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayUnion::getMaxCdrSerializedSize()); -#else - ArrayUnion_max_cdr_typesize; -#endif + set_name("ArrayUnion"); + uint32_t type_size = ArrayUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayUnion_max_key_cdr_typesize > 16 ? ArrayUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayUnion_max_key_cdr_typesize > 16 ? ArrayUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayUnionPubSubType::~ArrayUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool ArrayUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool ArrayUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool ArrayUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool ArrayUnionPubSubType::deserialize( return true; } -std::function ArrayUnionPubSubType::getSerializedSizeProvider( +uint32_t ArrayUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayUnionPubSubType::create_data() { return reinterpret_cast(new ArrayUnion()); } -void ArrayUnionPubSubType::deleteData( +void ArrayUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayUnionPubSubType::getKey( +bool ArrayUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool ArrayUnionPubSubType::getKey( const ArrayUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayUnion_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 || ArrayUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void ArrayUnionPubSubType::register_type_object_representation() ArrayStructurePubSubType::ArrayStructurePubSubType() { - setName("ArrayStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayStructure::getMaxCdrSerializedSize()); -#else - ArrayStructure_max_cdr_typesize; -#endif + set_name("ArrayStructure"); + uint32_t type_size = ArrayStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayStructure_max_key_cdr_typesize > 16 ? ArrayStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayStructure_max_key_cdr_typesize > 16 ? ArrayStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayStructurePubSubType::~ArrayStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool ArrayStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool ArrayStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool ArrayStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool ArrayStructurePubSubType::deserialize( return true; } -std::function ArrayStructurePubSubType::getSerializedSizeProvider( +uint32_t ArrayStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayStructurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayStructurePubSubType::create_data() { return reinterpret_cast(new ArrayStructure()); } -void ArrayStructurePubSubType::deleteData( +void ArrayStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayStructurePubSubType::getKey( +bool ArrayStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool ArrayStructurePubSubType::getKey( const ArrayStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayStructure_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 || ArrayStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void ArrayStructurePubSubType::register_type_object_representation() ArrayBitsetPubSubType::ArrayBitsetPubSubType() { - setName("ArrayBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayBitset::getMaxCdrSerializedSize()); -#else - ArrayBitset_max_cdr_typesize; -#endif + set_name("ArrayBitset"); + uint32_t type_size = ArrayBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayBitset_max_key_cdr_typesize > 16 ? ArrayBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayBitset_max_key_cdr_typesize > 16 ? ArrayBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayBitsetPubSubType::~ArrayBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool ArrayBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool ArrayBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool ArrayBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool ArrayBitsetPubSubType::deserialize( return true; } -std::function ArrayBitsetPubSubType::getSerializedSizeProvider( +uint32_t ArrayBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayBitsetPubSubType::create_data() { return reinterpret_cast(new ArrayBitset()); } -void ArrayBitsetPubSubType::deleteData( +void ArrayBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayBitsetPubSubType::getKey( +bool ArrayBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool ArrayBitsetPubSubType::getKey( const ArrayBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayBitset_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 || ArrayBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void ArrayBitsetPubSubType::register_type_object_representation() ArrayMultiDimensionShortPubSubType::ArrayMultiDimensionShortPubSubType() { - setName("ArrayMultiDimensionShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionShort::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionShort_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionShort"); + uint32_t type_size = ArrayMultiDimensionShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionShortPubSubType::~ArrayMultiDimensionShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool ArrayMultiDimensionShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool ArrayMultiDimensionShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool ArrayMultiDimensionShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool ArrayMultiDimensionShortPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionShortPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionShort()); } -void ArrayMultiDimensionShortPubSubType::deleteData( +void ArrayMultiDimensionShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionShortPubSubType::getKey( +bool ArrayMultiDimensionShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool ArrayMultiDimensionShortPubSubType::getKey( const ArrayMultiDimensionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionShort_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 || ArrayMultiDimensionShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void ArrayMultiDimensionShortPubSubType::register_type_object_representation() ArrayMultiDimensionUShortPubSubType::ArrayMultiDimensionUShortPubSubType() { - setName("ArrayMultiDimensionUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionUShort::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionUShort_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionUShort"); + uint32_t type_size = ArrayMultiDimensionUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionUShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionUShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionUShortPubSubType::~ArrayMultiDimensionUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool ArrayMultiDimensionUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool ArrayMultiDimensionUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool ArrayMultiDimensionUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool ArrayMultiDimensionUShortPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionUShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionUShortPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionUShort()); } -void ArrayMultiDimensionUShortPubSubType::deleteData( +void ArrayMultiDimensionUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionUShortPubSubType::getKey( +bool ArrayMultiDimensionUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool ArrayMultiDimensionUShortPubSubType::getKey( const ArrayMultiDimensionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionUShort_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 || ArrayMultiDimensionUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5437,26 +4541,21 @@ void ArrayMultiDimensionUShortPubSubType::register_type_object_representation() ArrayMultiDimensionLongPubSubType::ArrayMultiDimensionLongPubSubType() { - setName("ArrayMultiDimensionLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLong"); + uint32_t type_size = ArrayMultiDimensionLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLongPubSubType::~ArrayMultiDimensionLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5474,12 +4573,10 @@ bool ArrayMultiDimensionLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5494,11 +4591,7 @@ bool ArrayMultiDimensionLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5515,11 +4608,7 @@ bool ArrayMultiDimensionLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5536,52 +4625,43 @@ bool ArrayMultiDimensionLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLongPubSubType::createData() -{ - return reinterpret_cast(new ArrayMultiDimensionLong()); -} - -void ArrayMultiDimensionLongPubSubType::deleteData( + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLongPubSubType::create_data() +{ + return reinterpret_cast(new ArrayMultiDimensionLong()); +} + +void ArrayMultiDimensionLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLongPubSubType::getKey( +bool ArrayMultiDimensionLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5589,35 +4669,27 @@ bool ArrayMultiDimensionLongPubSubType::getKey( const ArrayMultiDimensionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLong_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 || ArrayMultiDimensionLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5630,26 +4702,21 @@ void ArrayMultiDimensionLongPubSubType::register_type_object_representation() ArrayMultiDimensionULongPubSubType::ArrayMultiDimensionULongPubSubType() { - setName("ArrayMultiDimensionULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionULong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionULong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionULong"); + uint32_t type_size = ArrayMultiDimensionULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionULong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionULong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionULongPubSubType::~ArrayMultiDimensionULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5667,12 +4734,10 @@ bool ArrayMultiDimensionULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5687,11 +4752,7 @@ bool ArrayMultiDimensionULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5708,11 +4769,7 @@ bool ArrayMultiDimensionULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5729,52 +4786,43 @@ bool ArrayMultiDimensionULongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionULongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionULongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionULong()); } -void ArrayMultiDimensionULongPubSubType::deleteData( +void ArrayMultiDimensionULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionULongPubSubType::getKey( +bool ArrayMultiDimensionULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5782,35 +4830,27 @@ bool ArrayMultiDimensionULongPubSubType::getKey( const ArrayMultiDimensionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionULong_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 || ArrayMultiDimensionULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5823,26 +4863,21 @@ void ArrayMultiDimensionULongPubSubType::register_type_object_representation() ArrayMultiDimensionLongLongPubSubType::ArrayMultiDimensionLongLongPubSubType() { - setName("ArrayMultiDimensionLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLongLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLongLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLongLong"); + uint32_t type_size = ArrayMultiDimensionLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLongLongPubSubType::~ArrayMultiDimensionLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5860,12 +4895,10 @@ bool ArrayMultiDimensionLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5880,11 +4913,7 @@ bool ArrayMultiDimensionLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5901,11 +4930,7 @@ bool ArrayMultiDimensionLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5922,52 +4947,43 @@ bool ArrayMultiDimensionLongLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLongLongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLongLong()); } -void ArrayMultiDimensionLongLongPubSubType::deleteData( +void ArrayMultiDimensionLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLongLongPubSubType::getKey( +bool ArrayMultiDimensionLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5975,35 +4991,27 @@ bool ArrayMultiDimensionLongLongPubSubType::getKey( const ArrayMultiDimensionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLongLong_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 || ArrayMultiDimensionLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6016,26 +5024,21 @@ void ArrayMultiDimensionLongLongPubSubType::register_type_object_representation( ArrayMultiDimensionULongLongPubSubType::ArrayMultiDimensionULongLongPubSubType() { - setName("ArrayMultiDimensionULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionULongLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionULongLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionULongLong"); + uint32_t type_size = ArrayMultiDimensionULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionULongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionULongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionULongLongPubSubType::~ArrayMultiDimensionULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6053,12 +5056,10 @@ bool ArrayMultiDimensionULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6073,11 +5074,7 @@ bool ArrayMultiDimensionULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6094,11 +5091,7 @@ bool ArrayMultiDimensionULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6115,52 +5108,43 @@ bool ArrayMultiDimensionULongLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionULongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionULongLongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionULongLong()); } -void ArrayMultiDimensionULongLongPubSubType::deleteData( +void ArrayMultiDimensionULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionULongLongPubSubType::getKey( +bool ArrayMultiDimensionULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6168,35 +5152,27 @@ bool ArrayMultiDimensionULongLongPubSubType::getKey( const ArrayMultiDimensionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionULongLong_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 || ArrayMultiDimensionULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6209,26 +5185,21 @@ void ArrayMultiDimensionULongLongPubSubType::register_type_object_representation ArrayMultiDimensionFloatPubSubType::ArrayMultiDimensionFloatPubSubType() { - setName("ArrayMultiDimensionFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionFloat::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionFloat_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionFloat"); + uint32_t type_size = ArrayMultiDimensionFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionFloat_max_key_cdr_typesize > 16 ? ArrayMultiDimensionFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionFloat_max_key_cdr_typesize > 16 ? ArrayMultiDimensionFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionFloatPubSubType::~ArrayMultiDimensionFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6246,12 +5217,10 @@ bool ArrayMultiDimensionFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6266,11 +5235,7 @@ bool ArrayMultiDimensionFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6287,11 +5252,7 @@ bool ArrayMultiDimensionFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6308,52 +5269,43 @@ bool ArrayMultiDimensionFloatPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionFloatPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionFloatPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionFloat()); } -void ArrayMultiDimensionFloatPubSubType::deleteData( +void ArrayMultiDimensionFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionFloatPubSubType::getKey( +bool ArrayMultiDimensionFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6361,35 +5313,27 @@ bool ArrayMultiDimensionFloatPubSubType::getKey( const ArrayMultiDimensionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionFloat_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 || ArrayMultiDimensionFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6402,26 +5346,21 @@ void ArrayMultiDimensionFloatPubSubType::register_type_object_representation() ArrayMultiDimensionDoublePubSubType::ArrayMultiDimensionDoublePubSubType() { - setName("ArrayMultiDimensionDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionDouble::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionDouble_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionDouble"); + uint32_t type_size = ArrayMultiDimensionDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionDoublePubSubType::~ArrayMultiDimensionDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6439,12 +5378,10 @@ bool ArrayMultiDimensionDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6459,11 +5396,7 @@ bool ArrayMultiDimensionDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6480,11 +5413,7 @@ bool ArrayMultiDimensionDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6501,52 +5430,43 @@ bool ArrayMultiDimensionDoublePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionDoublePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionDouble()); } -void ArrayMultiDimensionDoublePubSubType::deleteData( +void ArrayMultiDimensionDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionDoublePubSubType::getKey( +bool ArrayMultiDimensionDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6554,35 +5474,27 @@ bool ArrayMultiDimensionDoublePubSubType::getKey( const ArrayMultiDimensionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionDouble_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 || ArrayMultiDimensionDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6595,26 +5507,21 @@ void ArrayMultiDimensionDoublePubSubType::register_type_object_representation() ArrayMultiDimensionLongDoublePubSubType::ArrayMultiDimensionLongDoublePubSubType() { - setName("ArrayMultiDimensionLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLongDouble::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLongDouble_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLongDouble"); + uint32_t type_size = ArrayMultiDimensionLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLongDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLongDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLongDoublePubSubType::~ArrayMultiDimensionLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6632,12 +5539,10 @@ bool ArrayMultiDimensionLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6652,11 +5557,7 @@ bool ArrayMultiDimensionLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6673,11 +5574,7 @@ bool ArrayMultiDimensionLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6694,52 +5591,43 @@ bool ArrayMultiDimensionLongDoublePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLongDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLongDoublePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLongDouble()); } -void ArrayMultiDimensionLongDoublePubSubType::deleteData( +void ArrayMultiDimensionLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLongDoublePubSubType::getKey( +bool ArrayMultiDimensionLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6747,35 +5635,27 @@ bool ArrayMultiDimensionLongDoublePubSubType::getKey( const ArrayMultiDimensionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLongDouble_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 || ArrayMultiDimensionLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6788,26 +5668,21 @@ void ArrayMultiDimensionLongDoublePubSubType::register_type_object_representatio ArrayMultiDimensionBooleanPubSubType::ArrayMultiDimensionBooleanPubSubType() { - setName("ArrayMultiDimensionBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionBoolean::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionBoolean_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionBoolean"); + uint32_t type_size = ArrayMultiDimensionBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionBoolean_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionBoolean_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionBooleanPubSubType::~ArrayMultiDimensionBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6825,12 +5700,10 @@ bool ArrayMultiDimensionBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6845,11 +5718,7 @@ bool ArrayMultiDimensionBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6866,11 +5735,7 @@ bool ArrayMultiDimensionBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6887,52 +5752,43 @@ bool ArrayMultiDimensionBooleanPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionBooleanPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionBooleanPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionBoolean()); } -void ArrayMultiDimensionBooleanPubSubType::deleteData( +void ArrayMultiDimensionBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionBooleanPubSubType::getKey( +bool ArrayMultiDimensionBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6940,35 +5796,27 @@ bool ArrayMultiDimensionBooleanPubSubType::getKey( const ArrayMultiDimensionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionBoolean_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 || ArrayMultiDimensionBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6981,26 +5829,21 @@ void ArrayMultiDimensionBooleanPubSubType::register_type_object_representation() ArrayMultiDimensionOctetPubSubType::ArrayMultiDimensionOctetPubSubType() { - setName("ArrayMultiDimensionOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionOctet::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionOctet_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionOctet"); + uint32_t type_size = ArrayMultiDimensionOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionOctet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionOctet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionOctetPubSubType::~ArrayMultiDimensionOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7018,12 +5861,10 @@ bool ArrayMultiDimensionOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7038,11 +5879,7 @@ bool ArrayMultiDimensionOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7059,11 +5896,7 @@ bool ArrayMultiDimensionOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7080,52 +5913,43 @@ bool ArrayMultiDimensionOctetPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionOctetPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionOctetPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionOctet()); } -void ArrayMultiDimensionOctetPubSubType::deleteData( +void ArrayMultiDimensionOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionOctetPubSubType::getKey( +bool ArrayMultiDimensionOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7133,35 +5957,27 @@ bool ArrayMultiDimensionOctetPubSubType::getKey( const ArrayMultiDimensionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionOctet_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 || ArrayMultiDimensionOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7174,26 +5990,21 @@ void ArrayMultiDimensionOctetPubSubType::register_type_object_representation() ArrayMultiDimensionCharPubSubType::ArrayMultiDimensionCharPubSubType() { - setName("ArrayMultiDimensionChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionChar::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionChar_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionChar"); + uint32_t type_size = ArrayMultiDimensionChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionCharPubSubType::~ArrayMultiDimensionCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7211,12 +6022,10 @@ bool ArrayMultiDimensionCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7231,11 +6040,7 @@ bool ArrayMultiDimensionCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7252,11 +6057,7 @@ bool ArrayMultiDimensionCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7273,52 +6074,43 @@ bool ArrayMultiDimensionCharPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionCharPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionChar()); } -void ArrayMultiDimensionCharPubSubType::deleteData( +void ArrayMultiDimensionCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionCharPubSubType::getKey( +bool ArrayMultiDimensionCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7326,35 +6118,27 @@ bool ArrayMultiDimensionCharPubSubType::getKey( const ArrayMultiDimensionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionChar_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 || ArrayMultiDimensionChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7367,26 +6151,21 @@ void ArrayMultiDimensionCharPubSubType::register_type_object_representation() ArrayMultiDimensionWCharPubSubType::ArrayMultiDimensionWCharPubSubType() { - setName("ArrayMultiDimensionWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionWChar::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionWChar_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionWChar"); + uint32_t type_size = ArrayMultiDimensionWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionWChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionWChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionWCharPubSubType::~ArrayMultiDimensionWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7404,12 +6183,10 @@ bool ArrayMultiDimensionWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7424,11 +6201,7 @@ bool ArrayMultiDimensionWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7445,11 +6218,7 @@ bool ArrayMultiDimensionWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7466,52 +6235,43 @@ bool ArrayMultiDimensionWCharPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionWCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionWCharPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionWChar()); } -void ArrayMultiDimensionWCharPubSubType::deleteData( +void ArrayMultiDimensionWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionWCharPubSubType::getKey( +bool ArrayMultiDimensionWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7519,35 +6279,27 @@ bool ArrayMultiDimensionWCharPubSubType::getKey( const ArrayMultiDimensionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionWChar_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 || ArrayMultiDimensionWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7560,26 +6312,21 @@ void ArrayMultiDimensionWCharPubSubType::register_type_object_representation() ArrayMultiDimensionStringPubSubType::ArrayMultiDimensionStringPubSubType() { - setName("ArrayMultiDimensionString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionString"); + uint32_t type_size = ArrayMultiDimensionString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionStringPubSubType::~ArrayMultiDimensionStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7597,12 +6344,10 @@ bool ArrayMultiDimensionStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7617,11 +6362,7 @@ bool ArrayMultiDimensionStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7638,11 +6379,7 @@ bool ArrayMultiDimensionStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7659,52 +6396,43 @@ bool ArrayMultiDimensionStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionString()); } -void ArrayMultiDimensionStringPubSubType::deleteData( +void ArrayMultiDimensionStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionStringPubSubType::getKey( +bool ArrayMultiDimensionStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7712,35 +6440,27 @@ bool ArrayMultiDimensionStringPubSubType::getKey( const ArrayMultiDimensionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionString_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 || ArrayMultiDimensionString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7753,26 +6473,21 @@ void ArrayMultiDimensionStringPubSubType::register_type_object_representation() ArrayMultiDimensionWStringPubSubType::ArrayMultiDimensionWStringPubSubType() { - setName("ArrayMultiDimensionWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionWString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionWString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionWString"); + uint32_t type_size = ArrayMultiDimensionWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionWStringPubSubType::~ArrayMultiDimensionWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7790,12 +6505,10 @@ bool ArrayMultiDimensionWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7810,11 +6523,7 @@ bool ArrayMultiDimensionWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7831,11 +6540,7 @@ bool ArrayMultiDimensionWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7852,52 +6557,43 @@ bool ArrayMultiDimensionWStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionWStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionWString()); } -void ArrayMultiDimensionWStringPubSubType::deleteData( +void ArrayMultiDimensionWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionWStringPubSubType::getKey( +bool ArrayMultiDimensionWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7905,35 +6601,27 @@ bool ArrayMultiDimensionWStringPubSubType::getKey( const ArrayMultiDimensionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionWString_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 || ArrayMultiDimensionWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7946,26 +6634,21 @@ void ArrayMultiDimensionWStringPubSubType::register_type_object_representation() ArrayMultiDimensionBoundedStringPubSubType::ArrayMultiDimensionBoundedStringPubSubType() { - setName("ArrayMultiDimensionBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionBoundedString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionBoundedString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionBoundedString"); + uint32_t type_size = ArrayMultiDimensionBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionBoundedString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionBoundedString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionBoundedStringPubSubType::~ArrayMultiDimensionBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7983,12 +6666,10 @@ bool ArrayMultiDimensionBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8003,11 +6684,7 @@ bool ArrayMultiDimensionBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8024,11 +6701,7 @@ bool ArrayMultiDimensionBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8045,52 +6718,43 @@ bool ArrayMultiDimensionBoundedStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionBoundedStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionBoundedString()); } -void ArrayMultiDimensionBoundedStringPubSubType::deleteData( +void ArrayMultiDimensionBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionBoundedStringPubSubType::getKey( +bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8098,35 +6762,27 @@ bool ArrayMultiDimensionBoundedStringPubSubType::getKey( const ArrayMultiDimensionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionBoundedString_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 || ArrayMultiDimensionBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8139,26 +6795,21 @@ void ArrayMultiDimensionBoundedStringPubSubType::register_type_object_representa ArrayMultiDimensionBoundedWStringPubSubType::ArrayMultiDimensionBoundedWStringPubSubType() { - setName("ArrayMultiDimensionBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionBoundedWString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionBoundedWString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionBoundedWString"); + uint32_t type_size = ArrayMultiDimensionBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionBoundedWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionBoundedWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionBoundedWStringPubSubType::~ArrayMultiDimensionBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8176,12 +6827,10 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8196,11 +6845,7 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8217,11 +6862,7 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8238,52 +6879,43 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionBoundedWStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionBoundedWString()); } -void ArrayMultiDimensionBoundedWStringPubSubType::deleteData( +void ArrayMultiDimensionBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionBoundedWStringPubSubType::getKey( +bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8291,35 +6923,27 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::getKey( const ArrayMultiDimensionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionBoundedWString_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 || ArrayMultiDimensionBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8332,26 +6956,21 @@ void ArrayMultiDimensionBoundedWStringPubSubType::register_type_object_represent ArrayMultiDimensionEnumPubSubType::ArrayMultiDimensionEnumPubSubType() { - setName("ArrayMultiDimensionEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionEnum::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionEnum_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionEnum"); + uint32_t type_size = ArrayMultiDimensionEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionEnum_max_key_cdr_typesize > 16 ? ArrayMultiDimensionEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionEnum_max_key_cdr_typesize > 16 ? ArrayMultiDimensionEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionEnumPubSubType::~ArrayMultiDimensionEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8369,12 +6988,10 @@ bool ArrayMultiDimensionEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8389,11 +7006,7 @@ bool ArrayMultiDimensionEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8410,11 +7023,7 @@ bool ArrayMultiDimensionEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8431,52 +7040,43 @@ bool ArrayMultiDimensionEnumPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionEnumPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionEnumPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionEnum()); } -void ArrayMultiDimensionEnumPubSubType::deleteData( +void ArrayMultiDimensionEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionEnumPubSubType::getKey( +bool ArrayMultiDimensionEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8484,35 +7084,27 @@ bool ArrayMultiDimensionEnumPubSubType::getKey( const ArrayMultiDimensionEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionEnum_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 || ArrayMultiDimensionEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8525,26 +7117,21 @@ void ArrayMultiDimensionEnumPubSubType::register_type_object_representation() ArrayMultiDimensionBitMaskPubSubType::ArrayMultiDimensionBitMaskPubSubType() { - setName("ArrayMultiDimensionBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionBitMask::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionBitMask_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionBitMask"); + uint32_t type_size = ArrayMultiDimensionBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionBitMask_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionBitMask_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionBitMaskPubSubType::~ArrayMultiDimensionBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8562,12 +7149,10 @@ bool ArrayMultiDimensionBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8582,11 +7167,7 @@ bool ArrayMultiDimensionBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8603,11 +7184,7 @@ bool ArrayMultiDimensionBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8624,52 +7201,43 @@ bool ArrayMultiDimensionBitMaskPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionBitMaskPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionBitMaskPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionBitMask()); } -void ArrayMultiDimensionBitMaskPubSubType::deleteData( +void ArrayMultiDimensionBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionBitMaskPubSubType::getKey( +bool ArrayMultiDimensionBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8677,35 +7245,27 @@ bool ArrayMultiDimensionBitMaskPubSubType::getKey( const ArrayMultiDimensionBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionBitMask_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 || ArrayMultiDimensionBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8718,26 +7278,21 @@ void ArrayMultiDimensionBitMaskPubSubType::register_type_object_representation() ArrayMultiDimensionAliasPubSubType::ArrayMultiDimensionAliasPubSubType() { - setName("ArrayMultiDimensionAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionAlias::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionAlias_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionAlias"); + uint32_t type_size = ArrayMultiDimensionAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionAlias_max_key_cdr_typesize > 16 ? ArrayMultiDimensionAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionAlias_max_key_cdr_typesize > 16 ? ArrayMultiDimensionAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionAliasPubSubType::~ArrayMultiDimensionAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8755,12 +7310,10 @@ bool ArrayMultiDimensionAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8775,11 +7328,7 @@ bool ArrayMultiDimensionAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8796,11 +7345,7 @@ bool ArrayMultiDimensionAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8817,52 +7362,43 @@ bool ArrayMultiDimensionAliasPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionAliasPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionAliasPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionAlias()); } -void ArrayMultiDimensionAliasPubSubType::deleteData( +void ArrayMultiDimensionAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionAliasPubSubType::getKey( +bool ArrayMultiDimensionAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8870,35 +7406,27 @@ bool ArrayMultiDimensionAliasPubSubType::getKey( const ArrayMultiDimensionAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionAlias_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 || ArrayMultiDimensionAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8911,26 +7439,21 @@ void ArrayMultiDimensionAliasPubSubType::register_type_object_representation() ArrayMultiDimensionSequencePubSubType::ArrayMultiDimensionSequencePubSubType() { - setName("ArrayMultiDimensionSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionSequence::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionSequence_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionSequence"); + uint32_t type_size = ArrayMultiDimensionSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionSequence_max_key_cdr_typesize > 16 ? ArrayMultiDimensionSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionSequence_max_key_cdr_typesize > 16 ? ArrayMultiDimensionSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionSequencePubSubType::~ArrayMultiDimensionSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8948,12 +7471,10 @@ bool ArrayMultiDimensionSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8968,11 +7489,7 @@ bool ArrayMultiDimensionSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8989,11 +7506,7 @@ bool ArrayMultiDimensionSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9010,52 +7523,43 @@ bool ArrayMultiDimensionSequencePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionSequencePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionSequencePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionSequence()); } -void ArrayMultiDimensionSequencePubSubType::deleteData( +void ArrayMultiDimensionSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionSequencePubSubType::getKey( +bool ArrayMultiDimensionSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9063,35 +7567,27 @@ bool ArrayMultiDimensionSequencePubSubType::getKey( const ArrayMultiDimensionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionSequence_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 || ArrayMultiDimensionSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9104,26 +7600,21 @@ void ArrayMultiDimensionSequencePubSubType::register_type_object_representation( ArrayMultiDimensionMapPubSubType::ArrayMultiDimensionMapPubSubType() { - setName("ArrayMultiDimensionMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionMap::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionMap_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionMap"); + uint32_t type_size = ArrayMultiDimensionMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionMap_max_key_cdr_typesize > 16 ? ArrayMultiDimensionMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionMap_max_key_cdr_typesize > 16 ? ArrayMultiDimensionMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionMapPubSubType::~ArrayMultiDimensionMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9141,12 +7632,10 @@ bool ArrayMultiDimensionMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9161,11 +7650,7 @@ bool ArrayMultiDimensionMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9182,11 +7667,7 @@ bool ArrayMultiDimensionMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9203,52 +7684,43 @@ bool ArrayMultiDimensionMapPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionMapPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionMapPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionMap()); } -void ArrayMultiDimensionMapPubSubType::deleteData( +void ArrayMultiDimensionMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionMapPubSubType::getKey( +bool ArrayMultiDimensionMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9256,35 +7728,27 @@ bool ArrayMultiDimensionMapPubSubType::getKey( const ArrayMultiDimensionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionMap_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 || ArrayMultiDimensionMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9297,26 +7761,21 @@ void ArrayMultiDimensionMapPubSubType::register_type_object_representation() ArrayMultiDimensionUnionPubSubType::ArrayMultiDimensionUnionPubSubType() { - setName("ArrayMultiDimensionUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionUnion::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionUnion_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionUnion"); + uint32_t type_size = ArrayMultiDimensionUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionUnion_max_key_cdr_typesize > 16 ? ArrayMultiDimensionUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionUnion_max_key_cdr_typesize > 16 ? ArrayMultiDimensionUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionUnionPubSubType::~ArrayMultiDimensionUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9334,12 +7793,10 @@ bool ArrayMultiDimensionUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9354,11 +7811,7 @@ bool ArrayMultiDimensionUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9375,11 +7828,7 @@ bool ArrayMultiDimensionUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9396,52 +7845,43 @@ bool ArrayMultiDimensionUnionPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionUnionPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionUnionPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionUnion()); } -void ArrayMultiDimensionUnionPubSubType::deleteData( +void ArrayMultiDimensionUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionUnionPubSubType::getKey( +bool ArrayMultiDimensionUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9449,35 +7889,27 @@ bool ArrayMultiDimensionUnionPubSubType::getKey( const ArrayMultiDimensionUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionUnion_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 || ArrayMultiDimensionUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9490,26 +7922,21 @@ void ArrayMultiDimensionUnionPubSubType::register_type_object_representation() ArrayMultiDimensionStructurePubSubType::ArrayMultiDimensionStructurePubSubType() { - setName("ArrayMultiDimensionStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionStructure::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionStructure_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionStructure"); + uint32_t type_size = ArrayMultiDimensionStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionStructure_max_key_cdr_typesize > 16 ? ArrayMultiDimensionStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionStructure_max_key_cdr_typesize > 16 ? ArrayMultiDimensionStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionStructurePubSubType::~ArrayMultiDimensionStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9527,12 +7954,10 @@ bool ArrayMultiDimensionStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9547,11 +7972,7 @@ bool ArrayMultiDimensionStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9568,11 +7989,7 @@ bool ArrayMultiDimensionStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9589,52 +8006,43 @@ bool ArrayMultiDimensionStructurePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionStructurePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionStructurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionStructurePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionStructure()); } -void ArrayMultiDimensionStructurePubSubType::deleteData( +void ArrayMultiDimensionStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionStructurePubSubType::getKey( +bool ArrayMultiDimensionStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9642,35 +8050,27 @@ bool ArrayMultiDimensionStructurePubSubType::getKey( const ArrayMultiDimensionStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionStructure_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 || ArrayMultiDimensionStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9683,26 +8083,21 @@ void ArrayMultiDimensionStructurePubSubType::register_type_object_representation ArrayMultiDimensionBitsetPubSubType::ArrayMultiDimensionBitsetPubSubType() { - setName("ArrayMultiDimensionBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionBitset::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionBitset_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionBitset"); + uint32_t type_size = ArrayMultiDimensionBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionBitset_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionBitset_max_key_cdr_typesize > 16 ? ArrayMultiDimensionBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionBitsetPubSubType::~ArrayMultiDimensionBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9720,12 +8115,10 @@ bool ArrayMultiDimensionBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9740,11 +8133,7 @@ bool ArrayMultiDimensionBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9761,11 +8150,7 @@ bool ArrayMultiDimensionBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9782,52 +8167,43 @@ bool ArrayMultiDimensionBitsetPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionBitsetPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionBitsetPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionBitset()); } -void ArrayMultiDimensionBitsetPubSubType::deleteData( +void ArrayMultiDimensionBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionBitsetPubSubType::getKey( +bool ArrayMultiDimensionBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9835,35 +8211,27 @@ bool ArrayMultiDimensionBitsetPubSubType::getKey( const ArrayMultiDimensionBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionBitset_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 || ArrayMultiDimensionBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9878,26 +8246,21 @@ void ArrayMultiDimensionBitsetPubSubType::register_type_object_representation() ArraySingleDimensionLiteralsShortPubSubType::ArraySingleDimensionLiteralsShortPubSubType() { - setName("ArraySingleDimensionLiteralsShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsShort::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsShort_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsShort"); + uint32_t type_size = ArraySingleDimensionLiteralsShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsShort_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsShort_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsShortPubSubType::~ArraySingleDimensionLiteralsShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9915,12 +8278,10 @@ bool ArraySingleDimensionLiteralsShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9935,11 +8296,7 @@ bool ArraySingleDimensionLiteralsShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9956,11 +8313,7 @@ bool ArraySingleDimensionLiteralsShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9977,52 +8330,43 @@ bool ArraySingleDimensionLiteralsShortPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsShortPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsShortPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsShort()); } -void ArraySingleDimensionLiteralsShortPubSubType::deleteData( +void ArraySingleDimensionLiteralsShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsShortPubSubType::getKey( +bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10030,35 +8374,27 @@ bool ArraySingleDimensionLiteralsShortPubSubType::getKey( const ArraySingleDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsShort_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 || ArraySingleDimensionLiteralsShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10071,26 +8407,21 @@ void ArraySingleDimensionLiteralsShortPubSubType::register_type_object_represent ArraySingleDimensionLiteralsUnsignedShortPubSubType::ArraySingleDimensionLiteralsUnsignedShortPubSubType() { - setName("ArraySingleDimensionLiteralsUnsignedShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsUnsignedShort::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsUnsignedShort_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsUnsignedShort"); + uint32_t type_size = ArraySingleDimensionLiteralsUnsignedShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsUnsignedShort_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsUnsignedShort_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsUnsignedShortPubSubType::~ArraySingleDimensionLiteralsUnsignedShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10108,12 +8439,10 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10128,11 +8457,7 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10149,11 +8474,7 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10170,52 +8491,43 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsUnsignedShortPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsUnsignedShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsUnsignedShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsUnsignedShortPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsUnsignedShort()); } -void ArraySingleDimensionLiteralsUnsignedShortPubSubType::deleteData( +void ArraySingleDimensionLiteralsUnsignedShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::getKey( +bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10223,35 +8535,27 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::getKey( const ArraySingleDimensionLiteralsUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsUnsignedShort_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 || ArraySingleDimensionLiteralsUnsignedShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10264,26 +8568,21 @@ void ArraySingleDimensionLiteralsUnsignedShortPubSubType::register_type_object_r ArraySingleDimensionLiteralsLongPubSubType::ArraySingleDimensionLiteralsLongPubSubType() { - setName("ArraySingleDimensionLiteralsLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsLong::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsLong_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsLong"); + uint32_t type_size = ArraySingleDimensionLiteralsLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsLongPubSubType::~ArraySingleDimensionLiteralsLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10301,12 +8600,10 @@ bool ArraySingleDimensionLiteralsLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10321,11 +8618,7 @@ bool ArraySingleDimensionLiteralsLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10342,11 +8635,7 @@ bool ArraySingleDimensionLiteralsLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10363,52 +8652,43 @@ bool ArraySingleDimensionLiteralsLongPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsLongPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsLongPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsLong()); } -void ArraySingleDimensionLiteralsLongPubSubType::deleteData( +void ArraySingleDimensionLiteralsLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsLongPubSubType::getKey( +bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10416,35 +8696,27 @@ bool ArraySingleDimensionLiteralsLongPubSubType::getKey( const ArraySingleDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsLong_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 || ArraySingleDimensionLiteralsLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10457,26 +8729,21 @@ void ArraySingleDimensionLiteralsLongPubSubType::register_type_object_representa ArraySingleDimensionLiteralsUnsignedLongPubSubType::ArraySingleDimensionLiteralsUnsignedLongPubSubType() { - setName("ArraySingleDimensionLiteralsUnsignedLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsUnsignedLong::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsUnsignedLong_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsUnsignedLong"); + uint32_t type_size = ArraySingleDimensionLiteralsUnsignedLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsUnsignedLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsUnsignedLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsUnsignedLongPubSubType::~ArraySingleDimensionLiteralsUnsignedLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10494,12 +8761,10 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10514,11 +8779,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10535,11 +8796,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10556,52 +8813,43 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsUnsignedLongPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsUnsignedLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsUnsignedLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsUnsignedLongPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsUnsignedLong()); } -void ArraySingleDimensionLiteralsUnsignedLongPubSubType::deleteData( +void ArraySingleDimensionLiteralsUnsignedLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::getKey( +bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10609,35 +8857,27 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::getKey( const ArraySingleDimensionLiteralsUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsUnsignedLong_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 || ArraySingleDimensionLiteralsUnsignedLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10650,26 +8890,21 @@ void ArraySingleDimensionLiteralsUnsignedLongPubSubType::register_type_object_re ArraySingleDimensionLiteralsLongLongPubSubType::ArraySingleDimensionLiteralsLongLongPubSubType() { - setName("ArraySingleDimensionLiteralsLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsLongLong::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsLongLong_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsLongLong"); + uint32_t type_size = ArraySingleDimensionLiteralsLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsLongLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsLongLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsLongLongPubSubType::~ArraySingleDimensionLiteralsLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10687,12 +8922,10 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10707,11 +8940,7 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10728,11 +8957,7 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10749,52 +8974,43 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsLongLongPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsLongLongPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsLongLong()); } -void ArraySingleDimensionLiteralsLongLongPubSubType::deleteData( +void ArraySingleDimensionLiteralsLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsLongLongPubSubType::getKey( +bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10802,35 +9018,27 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::getKey( const ArraySingleDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsLongLong_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 || ArraySingleDimensionLiteralsLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10843,26 +9051,21 @@ void ArraySingleDimensionLiteralsLongLongPubSubType::register_type_object_repres ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::ArraySingleDimensionLiteralsUnsignedLongLongPubSubType() { - setName("ArraySingleDimensionLiteralsUnsignedLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsUnsignedLongLong::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsUnsignedLongLong_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsUnsignedLongLong"); + uint32_t type_size = ArraySingleDimensionLiteralsUnsignedLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsUnsignedLongLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsUnsignedLongLong_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnsignedLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::~ArraySingleDimensionLiteralsUnsignedLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10880,12 +9083,10 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10900,11 +9101,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10921,11 +9118,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10942,52 +9135,43 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsUnsignedLongLong()); } -void ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::deleteData( +void ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::getKey( +bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10995,35 +9179,27 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::getKey( const ArraySingleDimensionLiteralsUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsUnsignedLongLong_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 || ArraySingleDimensionLiteralsUnsignedLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11036,26 +9212,21 @@ void ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::register_type_objec ArraySingleDimensionLiteralsFloatPubSubType::ArraySingleDimensionLiteralsFloatPubSubType() { - setName("ArraySingleDimensionLiteralsFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsFloat::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsFloat_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsFloat"); + uint32_t type_size = ArraySingleDimensionLiteralsFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsFloat_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsFloat_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsFloatPubSubType::~ArraySingleDimensionLiteralsFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11073,12 +9244,10 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11093,11 +9262,7 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11114,11 +9279,7 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11135,52 +9296,43 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsFloatPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsFloatPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsFloat()); } -void ArraySingleDimensionLiteralsFloatPubSubType::deleteData( +void ArraySingleDimensionLiteralsFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsFloatPubSubType::getKey( +bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11188,35 +9340,27 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::getKey( const ArraySingleDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsFloat_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 || ArraySingleDimensionLiteralsFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11229,26 +9373,21 @@ void ArraySingleDimensionLiteralsFloatPubSubType::register_type_object_represent ArraySingleDimensionLiteralsDoublePubSubType::ArraySingleDimensionLiteralsDoublePubSubType() { - setName("ArraySingleDimensionLiteralsDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsDouble::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsDouble_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsDouble"); + uint32_t type_size = ArraySingleDimensionLiteralsDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsDouble_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsDouble_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsDoublePubSubType::~ArraySingleDimensionLiteralsDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11266,12 +9405,10 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11286,11 +9423,7 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11307,11 +9440,7 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11328,52 +9457,43 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsDoublePubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsDoublePubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsDouble()); } -void ArraySingleDimensionLiteralsDoublePubSubType::deleteData( +void ArraySingleDimensionLiteralsDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsDoublePubSubType::getKey( +bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11381,35 +9501,27 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::getKey( const ArraySingleDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsDouble_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 || ArraySingleDimensionLiteralsDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11422,26 +9534,21 @@ void ArraySingleDimensionLiteralsDoublePubSubType::register_type_object_represen ArraySingleDimensionLiteralsLongDoublePubSubType::ArraySingleDimensionLiteralsLongDoublePubSubType() { - setName("ArraySingleDimensionLiteralsLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsLongDouble::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsLongDouble_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsLongDouble"); + uint32_t type_size = ArraySingleDimensionLiteralsLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsLongDouble_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsLongDouble_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsLongDoublePubSubType::~ArraySingleDimensionLiteralsLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11459,12 +9566,10 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11479,11 +9584,7 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11500,11 +9601,7 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11521,52 +9618,43 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsLongDoublePubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsLongDoublePubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsLongDouble()); } -void ArraySingleDimensionLiteralsLongDoublePubSubType::deleteData( +void ArraySingleDimensionLiteralsLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsLongDoublePubSubType::getKey( +bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11574,35 +9662,27 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::getKey( const ArraySingleDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsLongDouble_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 || ArraySingleDimensionLiteralsLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11615,26 +9695,21 @@ void ArraySingleDimensionLiteralsLongDoublePubSubType::register_type_object_repr ArraySingleDimensionLiteralsBooleanPubSubType::ArraySingleDimensionLiteralsBooleanPubSubType() { - setName("ArraySingleDimensionLiteralsBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsBoolean::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsBoolean_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsBoolean"); + uint32_t type_size = ArraySingleDimensionLiteralsBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsBoolean_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsBoolean_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsBooleanPubSubType::~ArraySingleDimensionLiteralsBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11652,12 +9727,10 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11672,11 +9745,7 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11693,11 +9762,7 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11714,52 +9779,43 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsBooleanPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsBooleanPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsBoolean()); } -void ArraySingleDimensionLiteralsBooleanPubSubType::deleteData( +void ArraySingleDimensionLiteralsBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsBooleanPubSubType::getKey( +bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11767,35 +9823,27 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::getKey( const ArraySingleDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsBoolean_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 || ArraySingleDimensionLiteralsBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11808,26 +9856,21 @@ void ArraySingleDimensionLiteralsBooleanPubSubType::register_type_object_represe ArraySingleDimensionLiteralsOctetPubSubType::ArraySingleDimensionLiteralsOctetPubSubType() { - setName("ArraySingleDimensionLiteralsOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsOctet::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsOctet_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsOctet"); + uint32_t type_size = ArraySingleDimensionLiteralsOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsOctet_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsOctet_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsOctetPubSubType::~ArraySingleDimensionLiteralsOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11845,12 +9888,10 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11865,11 +9906,7 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11886,11 +9923,7 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11907,52 +9940,43 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsOctetPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsOctetPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsOctet()); } -void ArraySingleDimensionLiteralsOctetPubSubType::deleteData( +void ArraySingleDimensionLiteralsOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsOctetPubSubType::getKey( +bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11960,35 +9984,27 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::getKey( const ArraySingleDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsOctet_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 || ArraySingleDimensionLiteralsOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12001,26 +10017,21 @@ void ArraySingleDimensionLiteralsOctetPubSubType::register_type_object_represent ArraySingleDimensionLiteralsCharPubSubType::ArraySingleDimensionLiteralsCharPubSubType() { - setName("ArraySingleDimensionLiteralsChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsChar::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsChar_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsChar"); + uint32_t type_size = ArraySingleDimensionLiteralsChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsChar_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsChar_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsCharPubSubType::~ArraySingleDimensionLiteralsCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12038,12 +10049,10 @@ bool ArraySingleDimensionLiteralsCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12058,11 +10067,7 @@ bool ArraySingleDimensionLiteralsCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12079,11 +10084,7 @@ bool ArraySingleDimensionLiteralsCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12100,52 +10101,43 @@ bool ArraySingleDimensionLiteralsCharPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsCharPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsCharPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsChar()); } -void ArraySingleDimensionLiteralsCharPubSubType::deleteData( +void ArraySingleDimensionLiteralsCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsCharPubSubType::getKey( +bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12153,35 +10145,27 @@ bool ArraySingleDimensionLiteralsCharPubSubType::getKey( const ArraySingleDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsChar_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 || ArraySingleDimensionLiteralsChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12194,26 +10178,21 @@ void ArraySingleDimensionLiteralsCharPubSubType::register_type_object_representa ArraySingleDimensionLiteralsWCharPubSubType::ArraySingleDimensionLiteralsWCharPubSubType() { - setName("ArraySingleDimensionLiteralsWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsWChar::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsWChar_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsWChar"); + uint32_t type_size = ArraySingleDimensionLiteralsWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsWChar_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsWChar_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsWCharPubSubType::~ArraySingleDimensionLiteralsWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12231,12 +10210,10 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12251,11 +10228,7 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12272,11 +10245,7 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12293,52 +10262,43 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsWCharPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsWCharPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsWChar()); } -void ArraySingleDimensionLiteralsWCharPubSubType::deleteData( +void ArraySingleDimensionLiteralsWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsWCharPubSubType::getKey( +bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12346,35 +10306,27 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::getKey( const ArraySingleDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsWChar_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 || ArraySingleDimensionLiteralsWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12387,26 +10339,21 @@ void ArraySingleDimensionLiteralsWCharPubSubType::register_type_object_represent ArraySingleDimensionLiteralsStringPubSubType::ArraySingleDimensionLiteralsStringPubSubType() { - setName("ArraySingleDimensionLiteralsString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsString::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsString_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsString"); + uint32_t type_size = ArraySingleDimensionLiteralsString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsStringPubSubType::~ArraySingleDimensionLiteralsStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12424,12 +10371,10 @@ bool ArraySingleDimensionLiteralsStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12444,11 +10389,7 @@ bool ArraySingleDimensionLiteralsStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12465,11 +10406,7 @@ bool ArraySingleDimensionLiteralsStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12486,52 +10423,43 @@ bool ArraySingleDimensionLiteralsStringPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsStringPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsStringPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsString()); } -void ArraySingleDimensionLiteralsStringPubSubType::deleteData( +void ArraySingleDimensionLiteralsStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsStringPubSubType::getKey( +bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12539,35 +10467,27 @@ bool ArraySingleDimensionLiteralsStringPubSubType::getKey( const ArraySingleDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsString_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 || ArraySingleDimensionLiteralsString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12580,26 +10500,21 @@ void ArraySingleDimensionLiteralsStringPubSubType::register_type_object_represen ArraySingleDimensionLiteralsWStringPubSubType::ArraySingleDimensionLiteralsWStringPubSubType() { - setName("ArraySingleDimensionLiteralsWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsWString::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsWString_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsWString"); + uint32_t type_size = ArraySingleDimensionLiteralsWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsWString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsWString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsWStringPubSubType::~ArraySingleDimensionLiteralsWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12617,12 +10532,10 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12637,11 +10550,7 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12658,11 +10567,7 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12679,52 +10584,43 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsWStringPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsWStringPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsWString()); } -void ArraySingleDimensionLiteralsWStringPubSubType::deleteData( +void ArraySingleDimensionLiteralsWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsWStringPubSubType::getKey( +bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12732,35 +10628,27 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::getKey( const ArraySingleDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsWString_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 || ArraySingleDimensionLiteralsWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12773,26 +10661,21 @@ void ArraySingleDimensionLiteralsWStringPubSubType::register_type_object_represe ArraySingleDimensionLiteralsBoundedStringPubSubType::ArraySingleDimensionLiteralsBoundedStringPubSubType() { - setName("ArraySingleDimensionLiteralsBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsBoundedString::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsBoundedString_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsBoundedString"); + uint32_t type_size = ArraySingleDimensionLiteralsBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsBoundedString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsBoundedString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsBoundedStringPubSubType::~ArraySingleDimensionLiteralsBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12810,12 +10693,10 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12830,11 +10711,7 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12851,11 +10728,7 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12872,52 +10745,43 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsBoundedStringPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsBoundedString()); } -void ArraySingleDimensionLiteralsBoundedStringPubSubType::deleteData( +void ArraySingleDimensionLiteralsBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsBoundedStringPubSubType::getKey( +bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12925,35 +10789,27 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::getKey( const ArraySingleDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsBoundedString_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 || ArraySingleDimensionLiteralsBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12966,26 +10822,21 @@ void ArraySingleDimensionLiteralsBoundedStringPubSubType::register_type_object_r ArraySingleDimensionLiteralsBoundedWStringPubSubType::ArraySingleDimensionLiteralsBoundedWStringPubSubType() { - setName("ArraySingleDimensionLiteralsBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsBoundedWString::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsBoundedWString_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsBoundedWString"); + uint32_t type_size = ArraySingleDimensionLiteralsBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsBoundedWStringPubSubType::~ArraySingleDimensionLiteralsBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13003,12 +10854,10 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13023,11 +10872,7 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13044,11 +10889,7 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13065,52 +10906,43 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsBoundedWStringPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsBoundedWString()); } -void ArraySingleDimensionLiteralsBoundedWStringPubSubType::deleteData( +void ArraySingleDimensionLiteralsBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::getKey( +bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13118,35 +10950,27 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::getKey( const ArraySingleDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsBoundedWString_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 || ArraySingleDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13159,26 +10983,21 @@ void ArraySingleDimensionLiteralsBoundedWStringPubSubType::register_type_object_ ArraySingleDimensionLiteralsEnumPubSubType::ArraySingleDimensionLiteralsEnumPubSubType() { - setName("ArraySingleDimensionLiteralsEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsEnum::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsEnum_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsEnum"); + uint32_t type_size = ArraySingleDimensionLiteralsEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsEnum_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsEnum_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsEnumPubSubType::~ArraySingleDimensionLiteralsEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13196,12 +11015,10 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13216,11 +11033,7 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13237,11 +11050,7 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13258,52 +11067,43 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsEnumPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsEnumPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsEnum()); } -void ArraySingleDimensionLiteralsEnumPubSubType::deleteData( +void ArraySingleDimensionLiteralsEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsEnumPubSubType::getKey( +bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13311,35 +11111,27 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::getKey( const ArraySingleDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsEnum_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 || ArraySingleDimensionLiteralsEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13352,26 +11144,21 @@ void ArraySingleDimensionLiteralsEnumPubSubType::register_type_object_representa ArraySingleDimensionLiteralsBitMaskPubSubType::ArraySingleDimensionLiteralsBitMaskPubSubType() { - setName("ArraySingleDimensionLiteralsBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsBitMask::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsBitMask_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsBitMask"); + uint32_t type_size = ArraySingleDimensionLiteralsBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsBitMask_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsBitMask_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsBitMaskPubSubType::~ArraySingleDimensionLiteralsBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13389,12 +11176,10 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13409,11 +11194,7 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13430,11 +11211,7 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13451,52 +11228,43 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsBitMaskPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsBitMaskPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsBitMask()); } -void ArraySingleDimensionLiteralsBitMaskPubSubType::deleteData( +void ArraySingleDimensionLiteralsBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsBitMaskPubSubType::getKey( +bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13504,35 +11272,27 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::getKey( const ArraySingleDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsBitMask_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 || ArraySingleDimensionLiteralsBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13545,26 +11305,21 @@ void ArraySingleDimensionLiteralsBitMaskPubSubType::register_type_object_represe ArraySingleDimensionLiteralsAliasPubSubType::ArraySingleDimensionLiteralsAliasPubSubType() { - setName("ArraySingleDimensionLiteralsAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsAlias::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsAlias_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsAlias"); + uint32_t type_size = ArraySingleDimensionLiteralsAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsAlias_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsAlias_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsAliasPubSubType::~ArraySingleDimensionLiteralsAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13582,12 +11337,10 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13602,11 +11355,7 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13623,11 +11372,7 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13644,52 +11389,43 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsAliasPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsAliasPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsAlias()); } -void ArraySingleDimensionLiteralsAliasPubSubType::deleteData( +void ArraySingleDimensionLiteralsAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsAliasPubSubType::getKey( +bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13697,35 +11433,27 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::getKey( const ArraySingleDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsAlias_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 || ArraySingleDimensionLiteralsAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13738,26 +11466,21 @@ void ArraySingleDimensionLiteralsAliasPubSubType::register_type_object_represent ArraySingleDimensionLiteralsShortArrayPubSubType::ArraySingleDimensionLiteralsShortArrayPubSubType() { - setName("ArraySingleDimensionLiteralsShortArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsShortArray::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsShortArray_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsShortArray"); + uint32_t type_size = ArraySingleDimensionLiteralsShortArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsShortArray_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsShortArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsShortArray_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsShortArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsShortArrayPubSubType::~ArraySingleDimensionLiteralsShortArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13775,12 +11498,10 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13795,11 +11516,7 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13816,11 +11533,7 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13837,52 +11550,43 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsShortArrayPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsShortArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsShortArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsShortArrayPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsShortArray()); } -void ArraySingleDimensionLiteralsShortArrayPubSubType::deleteData( +void ArraySingleDimensionLiteralsShortArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsShortArrayPubSubType::getKey( +bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13890,35 +11594,27 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::getKey( const ArraySingleDimensionLiteralsShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsShortArray_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 || ArraySingleDimensionLiteralsShortArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13931,26 +11627,21 @@ void ArraySingleDimensionLiteralsShortArrayPubSubType::register_type_object_repr ArraySingleDimensionLiteralsSequencePubSubType::ArraySingleDimensionLiteralsSequencePubSubType() { - setName("ArraySingleDimensionLiteralsSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsSequence::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsSequence_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsSequence"); + uint32_t type_size = ArraySingleDimensionLiteralsSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsSequence_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsSequence_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsSequencePubSubType::~ArraySingleDimensionLiteralsSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13968,12 +11659,10 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13988,11 +11677,7 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14009,11 +11694,7 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14030,52 +11711,43 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsSequencePubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsSequencePubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsSequence()); } -void ArraySingleDimensionLiteralsSequencePubSubType::deleteData( +void ArraySingleDimensionLiteralsSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsSequencePubSubType::getKey( +bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14083,35 +11755,27 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::getKey( const ArraySingleDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsSequence_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 || ArraySingleDimensionLiteralsSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14124,26 +11788,21 @@ void ArraySingleDimensionLiteralsSequencePubSubType::register_type_object_repres ArraySingleDimensionLiteralsMapPubSubType::ArraySingleDimensionLiteralsMapPubSubType() { - setName("ArraySingleDimensionLiteralsMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsMap::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsMap_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsMap"); + uint32_t type_size = ArraySingleDimensionLiteralsMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsMap_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsMap_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsMapPubSubType::~ArraySingleDimensionLiteralsMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14161,12 +11820,10 @@ bool ArraySingleDimensionLiteralsMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14181,11 +11838,7 @@ bool ArraySingleDimensionLiteralsMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14202,11 +11855,7 @@ bool ArraySingleDimensionLiteralsMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14223,52 +11872,43 @@ bool ArraySingleDimensionLiteralsMapPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsMapPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsMapPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsMap()); } -void ArraySingleDimensionLiteralsMapPubSubType::deleteData( +void ArraySingleDimensionLiteralsMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsMapPubSubType::getKey( +bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14276,35 +11916,27 @@ bool ArraySingleDimensionLiteralsMapPubSubType::getKey( const ArraySingleDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsMap_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 || ArraySingleDimensionLiteralsMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14317,26 +11949,21 @@ void ArraySingleDimensionLiteralsMapPubSubType::register_type_object_representat ArraySingleDimensionLiteralsUnionPubSubType::ArraySingleDimensionLiteralsUnionPubSubType() { - setName("ArraySingleDimensionLiteralsUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsUnion::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsUnion_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsUnion"); + uint32_t type_size = ArraySingleDimensionLiteralsUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsUnion_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsUnion_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsUnionPubSubType::~ArraySingleDimensionLiteralsUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14354,12 +11981,10 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14374,11 +11999,7 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14395,11 +12016,7 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14416,52 +12033,43 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsUnionPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsUnionPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsUnion()); } -void ArraySingleDimensionLiteralsUnionPubSubType::deleteData( +void ArraySingleDimensionLiteralsUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsUnionPubSubType::getKey( +bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14469,35 +12077,27 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::getKey( const ArraySingleDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsUnion_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 || ArraySingleDimensionLiteralsUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14510,26 +12110,21 @@ void ArraySingleDimensionLiteralsUnionPubSubType::register_type_object_represent ArraySingleDimensionLiteralsStructurePubSubType::ArraySingleDimensionLiteralsStructurePubSubType() { - setName("ArraySingleDimensionLiteralsStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsStructure::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsStructure_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsStructure"); + uint32_t type_size = ArraySingleDimensionLiteralsStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsStructure_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsStructure_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsStructurePubSubType::~ArraySingleDimensionLiteralsStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14547,12 +12142,10 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14567,11 +12160,7 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14588,11 +12177,7 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14609,52 +12194,43 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsStructurePubSubType::getSerializedSizeProvider( - const void* const data, - DataRepresentationId_t data_representation) -{ - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsStructurePubSubType::createData() +uint32_t ArraySingleDimensionLiteralsStructurePubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsStructurePubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsStructure()); } -void ArraySingleDimensionLiteralsStructurePubSubType::deleteData( +void ArraySingleDimensionLiteralsStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsStructurePubSubType::getKey( +bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14662,35 +12238,27 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::getKey( const ArraySingleDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsStructure_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 || ArraySingleDimensionLiteralsStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14703,26 +12271,21 @@ void ArraySingleDimensionLiteralsStructurePubSubType::register_type_object_repre ArraySingleDimensionLiteralsBitsetPubSubType::ArraySingleDimensionLiteralsBitsetPubSubType() { - setName("ArraySingleDimensionLiteralsBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArraySingleDimensionLiteralsBitset::getMaxCdrSerializedSize()); -#else - ArraySingleDimensionLiteralsBitset_max_cdr_typesize; -#endif + set_name("ArraySingleDimensionLiteralsBitset"); + uint32_t type_size = ArraySingleDimensionLiteralsBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArraySingleDimensionLiteralsBitset_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArraySingleDimensionLiteralsBitset_max_key_cdr_typesize > 16 ? ArraySingleDimensionLiteralsBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArraySingleDimensionLiteralsBitsetPubSubType::~ArraySingleDimensionLiteralsBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14740,12 +12303,10 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14760,11 +12321,7 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14781,11 +12338,7 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14802,52 +12355,43 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::deserialize( return true; } -std::function ArraySingleDimensionLiteralsBitsetPubSubType::getSerializedSizeProvider( +uint32_t ArraySingleDimensionLiteralsBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArraySingleDimensionLiteralsBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArraySingleDimensionLiteralsBitsetPubSubType::create_data() { return reinterpret_cast(new ArraySingleDimensionLiteralsBitset()); } -void ArraySingleDimensionLiteralsBitsetPubSubType::deleteData( +void ArraySingleDimensionLiteralsBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArraySingleDimensionLiteralsBitsetPubSubType::getKey( +bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14855,35 +12399,27 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::getKey( const ArraySingleDimensionLiteralsBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArraySingleDimensionLiteralsBitset_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 || ArraySingleDimensionLiteralsBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14896,26 +12432,21 @@ void ArraySingleDimensionLiteralsBitsetPubSubType::register_type_object_represen ArrayMultiDimensionLiteralsShortPubSubType::ArrayMultiDimensionLiteralsShortPubSubType() { - setName("ArrayMultiDimensionLiteralsShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsShort::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsShort_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsShort"); + uint32_t type_size = ArrayMultiDimensionLiteralsShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsShortPubSubType::~ArrayMultiDimensionLiteralsShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14933,12 +12464,10 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14953,11 +12482,7 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14974,11 +12499,7 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14995,52 +12516,43 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsShortPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsShort()); } -void ArrayMultiDimensionLiteralsShortPubSubType::deleteData( +void ArrayMultiDimensionLiteralsShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsShortPubSubType::getKey( +bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15048,35 +12560,27 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::getKey( const ArrayMultiDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsShort_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 || ArrayMultiDimensionLiteralsShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15089,26 +12593,21 @@ void ArrayMultiDimensionLiteralsShortPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsUShortPubSubType::ArrayMultiDimensionLiteralsUShortPubSubType() { - setName("ArrayMultiDimensionLiteralsUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsUShort::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsUShort_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsUShort"); + uint32_t type_size = ArrayMultiDimensionLiteralsUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsUShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsUShort_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsUShortPubSubType::~ArrayMultiDimensionLiteralsUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15126,12 +12625,10 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15146,11 +12643,7 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15167,11 +12660,7 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15188,52 +12677,43 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsUShortPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsUShortPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsUShort()); } -void ArrayMultiDimensionLiteralsUShortPubSubType::deleteData( +void ArrayMultiDimensionLiteralsUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsUShortPubSubType::getKey( +bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15241,35 +12721,27 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::getKey( const ArrayMultiDimensionLiteralsUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsUShort_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 || ArrayMultiDimensionLiteralsUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15282,26 +12754,21 @@ void ArrayMultiDimensionLiteralsUShortPubSubType::register_type_object_represent ArrayMultiDimensionLiteralsLongPubSubType::ArrayMultiDimensionLiteralsLongPubSubType() { - setName("ArrayMultiDimensionLiteralsLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsLong"); + uint32_t type_size = ArrayMultiDimensionLiteralsLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsLongPubSubType::~ArrayMultiDimensionLiteralsLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15319,12 +12786,10 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15339,11 +12804,7 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15360,11 +12821,7 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15381,52 +12838,43 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsLongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsLong()); } -void ArrayMultiDimensionLiteralsLongPubSubType::deleteData( +void ArrayMultiDimensionLiteralsLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsLongPubSubType::getKey( +bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15434,35 +12882,27 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::getKey( const ArrayMultiDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsLong_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 || ArrayMultiDimensionLiteralsLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15475,26 +12915,21 @@ void ArrayMultiDimensionLiteralsLongPubSubType::register_type_object_representat ArrayMultiDimensionLiteralsULongPubSubType::ArrayMultiDimensionLiteralsULongPubSubType() { - setName("ArrayMultiDimensionLiteralsULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsULong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsULong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsULong"); + uint32_t type_size = ArrayMultiDimensionLiteralsULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsULong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsULong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsULongPubSubType::~ArrayMultiDimensionLiteralsULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15512,12 +12947,10 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15532,11 +12965,7 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15553,11 +12982,7 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15574,52 +12999,43 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsULongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsULongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsULong()); } -void ArrayMultiDimensionLiteralsULongPubSubType::deleteData( +void ArrayMultiDimensionLiteralsULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsULongPubSubType::getKey( +bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15627,35 +13043,27 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::getKey( const ArrayMultiDimensionLiteralsULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsULong_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 || ArrayMultiDimensionLiteralsULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15668,26 +13076,21 @@ void ArrayMultiDimensionLiteralsULongPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsLongLongPubSubType::ArrayMultiDimensionLiteralsLongLongPubSubType() { - setName("ArrayMultiDimensionLiteralsLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsLongLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsLongLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsLongLong"); + uint32_t type_size = ArrayMultiDimensionLiteralsLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsLongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsLongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsLongLongPubSubType::~ArrayMultiDimensionLiteralsLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15705,12 +13108,10 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15725,11 +13126,7 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15746,11 +13143,7 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15767,52 +13160,43 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsLongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsLongLongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsLongLong()); } -void ArrayMultiDimensionLiteralsLongLongPubSubType::deleteData( +void ArrayMultiDimensionLiteralsLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsLongLongPubSubType::getKey( +bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15820,35 +13204,27 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::getKey( const ArrayMultiDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsLongLong_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 || ArrayMultiDimensionLiteralsLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15861,26 +13237,21 @@ void ArrayMultiDimensionLiteralsLongLongPubSubType::register_type_object_represe ArrayMultiDimensionLiteralsULongLongPubSubType::ArrayMultiDimensionLiteralsULongLongPubSubType() { - setName("ArrayMultiDimensionLiteralsULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsULongLong::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsULongLong_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsULongLong"); + uint32_t type_size = ArrayMultiDimensionLiteralsULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsULongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsULongLong_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsULongLongPubSubType::~ArrayMultiDimensionLiteralsULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15898,12 +13269,10 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15918,11 +13287,7 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15939,11 +13304,7 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15960,52 +13321,43 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsULongLongPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsULongLongPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsULongLong()); } -void ArrayMultiDimensionLiteralsULongLongPubSubType::deleteData( +void ArrayMultiDimensionLiteralsULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsULongLongPubSubType::getKey( +bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16013,35 +13365,27 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::getKey( const ArrayMultiDimensionLiteralsULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsULongLong_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 || ArrayMultiDimensionLiteralsULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16054,26 +13398,21 @@ void ArrayMultiDimensionLiteralsULongLongPubSubType::register_type_object_repres ArrayMultiDimensionLiteralsFloatPubSubType::ArrayMultiDimensionLiteralsFloatPubSubType() { - setName("ArrayMultiDimensionLiteralsFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsFloat::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsFloat_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsFloat"); + uint32_t type_size = ArrayMultiDimensionLiteralsFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsFloat_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsFloat_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsFloatPubSubType::~ArrayMultiDimensionLiteralsFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16091,12 +13430,10 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16111,11 +13448,7 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16132,11 +13465,7 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16153,52 +13482,43 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsFloatPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsFloatPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsFloat()); } -void ArrayMultiDimensionLiteralsFloatPubSubType::deleteData( +void ArrayMultiDimensionLiteralsFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsFloatPubSubType::getKey( +bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16206,35 +13526,27 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::getKey( const ArrayMultiDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsFloat_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 || ArrayMultiDimensionLiteralsFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16247,26 +13559,21 @@ void ArrayMultiDimensionLiteralsFloatPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsDoublePubSubType::ArrayMultiDimensionLiteralsDoublePubSubType() { - setName("ArrayMultiDimensionLiteralsDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsDouble::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsDouble_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsDouble"); + uint32_t type_size = ArrayMultiDimensionLiteralsDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsDoublePubSubType::~ArrayMultiDimensionLiteralsDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16284,12 +13591,10 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16304,11 +13609,7 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16325,11 +13626,7 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16346,52 +13643,43 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsDoublePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsDouble()); } -void ArrayMultiDimensionLiteralsDoublePubSubType::deleteData( +void ArrayMultiDimensionLiteralsDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsDoublePubSubType::getKey( +bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16399,35 +13687,27 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::getKey( const ArrayMultiDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsDouble_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 || ArrayMultiDimensionLiteralsDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16440,26 +13720,21 @@ void ArrayMultiDimensionLiteralsDoublePubSubType::register_type_object_represent ArrayMultiDimensionLiteralsLongDoublePubSubType::ArrayMultiDimensionLiteralsLongDoublePubSubType() { - setName("ArrayMultiDimensionLiteralsLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsLongDouble::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsLongDouble_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsLongDouble"); + uint32_t type_size = ArrayMultiDimensionLiteralsLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsLongDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsLongDouble_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsLongDoublePubSubType::~ArrayMultiDimensionLiteralsLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16477,12 +13752,10 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16497,11 +13770,7 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16518,11 +13787,7 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16539,52 +13804,43 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsLongDoublePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsLongDoublePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsLongDouble()); } -void ArrayMultiDimensionLiteralsLongDoublePubSubType::deleteData( +void ArrayMultiDimensionLiteralsLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsLongDoublePubSubType::getKey( +bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16592,35 +13848,27 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::getKey( const ArrayMultiDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsLongDouble_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 || ArrayMultiDimensionLiteralsLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16633,26 +13881,21 @@ void ArrayMultiDimensionLiteralsLongDoublePubSubType::register_type_object_repre ArrayMultiDimensionLiteralsBooleanPubSubType::ArrayMultiDimensionLiteralsBooleanPubSubType() { - setName("ArrayMultiDimensionLiteralsBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsBoolean::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsBoolean_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsBoolean"); + uint32_t type_size = ArrayMultiDimensionLiteralsBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsBoolean_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsBoolean_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsBooleanPubSubType::~ArrayMultiDimensionLiteralsBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16670,12 +13913,10 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16690,11 +13931,7 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16711,11 +13948,7 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16732,52 +13965,43 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsBooleanPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsBooleanPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsBoolean()); } -void ArrayMultiDimensionLiteralsBooleanPubSubType::deleteData( +void ArrayMultiDimensionLiteralsBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsBooleanPubSubType::getKey( +bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16785,35 +14009,27 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::getKey( const ArrayMultiDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsBoolean_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 || ArrayMultiDimensionLiteralsBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16826,26 +14042,21 @@ void ArrayMultiDimensionLiteralsBooleanPubSubType::register_type_object_represen ArrayMultiDimensionLiteralsOctetPubSubType::ArrayMultiDimensionLiteralsOctetPubSubType() { - setName("ArrayMultiDimensionLiteralsOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsOctet::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsOctet_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsOctet"); + uint32_t type_size = ArrayMultiDimensionLiteralsOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsOctet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsOctet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsOctetPubSubType::~ArrayMultiDimensionLiteralsOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16863,12 +14074,10 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16883,11 +14092,7 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16904,11 +14109,7 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16925,52 +14126,43 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsOctetPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsOctetPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsOctet()); } -void ArrayMultiDimensionLiteralsOctetPubSubType::deleteData( +void ArrayMultiDimensionLiteralsOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsOctetPubSubType::getKey( +bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16978,35 +14170,27 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::getKey( const ArrayMultiDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsOctet_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 || ArrayMultiDimensionLiteralsOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17019,26 +14203,21 @@ void ArrayMultiDimensionLiteralsOctetPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsCharPubSubType::ArrayMultiDimensionLiteralsCharPubSubType() { - setName("ArrayMultiDimensionLiteralsChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsChar::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsChar_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsChar"); + uint32_t type_size = ArrayMultiDimensionLiteralsChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsCharPubSubType::~ArrayMultiDimensionLiteralsCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17056,12 +14235,10 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17076,11 +14253,7 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17097,11 +14270,7 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17118,52 +14287,43 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsCharPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsChar()); } -void ArrayMultiDimensionLiteralsCharPubSubType::deleteData( +void ArrayMultiDimensionLiteralsCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsCharPubSubType::getKey( +bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17171,35 +14331,27 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::getKey( const ArrayMultiDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsChar_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 || ArrayMultiDimensionLiteralsChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17212,26 +14364,21 @@ void ArrayMultiDimensionLiteralsCharPubSubType::register_type_object_representat ArrayMultiDimensionLiteralsWCharPubSubType::ArrayMultiDimensionLiteralsWCharPubSubType() { - setName("ArrayMultiDimensionLiteralsWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsWChar::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsWChar_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsWChar"); + uint32_t type_size = ArrayMultiDimensionLiteralsWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsWChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsWChar_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsWCharPubSubType::~ArrayMultiDimensionLiteralsWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17249,12 +14396,10 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17269,11 +14414,7 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17290,11 +14431,7 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17311,52 +14448,43 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsWCharPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsWCharPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsWChar()); } -void ArrayMultiDimensionLiteralsWCharPubSubType::deleteData( +void ArrayMultiDimensionLiteralsWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsWCharPubSubType::getKey( +bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17364,35 +14492,27 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::getKey( const ArrayMultiDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsWChar_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 || ArrayMultiDimensionLiteralsWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17405,26 +14525,21 @@ void ArrayMultiDimensionLiteralsWCharPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsStringPubSubType::ArrayMultiDimensionLiteralsStringPubSubType() { - setName("ArrayMultiDimensionLiteralsString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsString"); + uint32_t type_size = ArrayMultiDimensionLiteralsString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsStringPubSubType::~ArrayMultiDimensionLiteralsStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17442,12 +14557,10 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17462,11 +14575,7 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17483,11 +14592,7 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17504,52 +14609,43 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsString()); } -void ArrayMultiDimensionLiteralsStringPubSubType::deleteData( +void ArrayMultiDimensionLiteralsStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsStringPubSubType::getKey( +bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17557,35 +14653,27 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::getKey( const ArrayMultiDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsString_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 || ArrayMultiDimensionLiteralsString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17598,26 +14686,21 @@ void ArrayMultiDimensionLiteralsStringPubSubType::register_type_object_represent ArrayMultiDimensionLiteralsWStringPubSubType::ArrayMultiDimensionLiteralsWStringPubSubType() { - setName("ArrayMultiDimensionLiteralsWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsWString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsWString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsWString"); + uint32_t type_size = ArrayMultiDimensionLiteralsWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsWStringPubSubType::~ArrayMultiDimensionLiteralsWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17635,12 +14718,10 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17655,11 +14736,7 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17676,11 +14753,7 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17697,52 +14770,43 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsWStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsWString()); } -void ArrayMultiDimensionLiteralsWStringPubSubType::deleteData( +void ArrayMultiDimensionLiteralsWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsWStringPubSubType::getKey( +bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17750,35 +14814,27 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::getKey( const ArrayMultiDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsWString_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 || ArrayMultiDimensionLiteralsWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17791,26 +14847,21 @@ void ArrayMultiDimensionLiteralsWStringPubSubType::register_type_object_represen ArrayMultiDimensionLiteralsBoundedStringPubSubType::ArrayMultiDimensionLiteralsBoundedStringPubSubType() { - setName("ArrayMultiDimensionLiteralsBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsBoundedString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsBoundedString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsBoundedString"); + uint32_t type_size = ArrayMultiDimensionLiteralsBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsBoundedString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsBoundedString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsBoundedStringPubSubType::~ArrayMultiDimensionLiteralsBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17828,12 +14879,10 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17848,11 +14897,7 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17869,11 +14914,7 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17890,52 +14931,43 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsBoundedStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsBoundedString()); } -void ArrayMultiDimensionLiteralsBoundedStringPubSubType::deleteData( +void ArrayMultiDimensionLiteralsBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::getKey( +bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17943,35 +14975,27 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::getKey( const ArrayMultiDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsBoundedString_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 || ArrayMultiDimensionLiteralsBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17984,26 +15008,21 @@ void ArrayMultiDimensionLiteralsBoundedStringPubSubType::register_type_object_re ArrayMultiDimensionLiteralsBoundedWStringPubSubType::ArrayMultiDimensionLiteralsBoundedWStringPubSubType() { - setName("ArrayMultiDimensionLiteralsBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsBoundedWString::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsBoundedWString_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsBoundedWString"); + uint32_t type_size = ArrayMultiDimensionLiteralsBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsBoundedWStringPubSubType::~ArrayMultiDimensionLiteralsBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18021,12 +15040,10 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18041,11 +15058,7 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18062,11 +15075,7 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18083,52 +15092,43 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsBoundedWStringPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsBoundedWString()); } -void ArrayMultiDimensionLiteralsBoundedWStringPubSubType::deleteData( +void ArrayMultiDimensionLiteralsBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::getKey( +bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18136,35 +15136,27 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::getKey( const ArrayMultiDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsBoundedWString_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 || ArrayMultiDimensionLiteralsBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18177,26 +15169,21 @@ void ArrayMultiDimensionLiteralsBoundedWStringPubSubType::register_type_object_r ArrayMultiDimensionLiteralsEnumPubSubType::ArrayMultiDimensionLiteralsEnumPubSubType() { - setName("ArrayMultiDimensionLiteralsEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsEnum::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsEnum_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsEnum"); + uint32_t type_size = ArrayMultiDimensionLiteralsEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsEnum_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsEnum_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsEnumPubSubType::~ArrayMultiDimensionLiteralsEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18214,12 +15201,10 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18234,11 +15219,7 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18255,11 +15236,7 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18276,52 +15253,43 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsEnumPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsEnumPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsEnum()); } -void ArrayMultiDimensionLiteralsEnumPubSubType::deleteData( +void ArrayMultiDimensionLiteralsEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsEnumPubSubType::getKey( +bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18329,35 +15297,27 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::getKey( const ArrayMultiDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsEnum_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 || ArrayMultiDimensionLiteralsEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18370,26 +15330,21 @@ void ArrayMultiDimensionLiteralsEnumPubSubType::register_type_object_representat ArrayMultiDimensionLiteralsBitMaskPubSubType::ArrayMultiDimensionLiteralsBitMaskPubSubType() { - setName("ArrayMultiDimensionLiteralsBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsBitMask::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsBitMask_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsBitMask"); + uint32_t type_size = ArrayMultiDimensionLiteralsBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsBitMask_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsBitMask_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsBitMaskPubSubType::~ArrayMultiDimensionLiteralsBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18407,12 +15362,10 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18427,11 +15380,7 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18448,11 +15397,7 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18469,52 +15414,43 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsBitMaskPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsBitMaskPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsBitMask()); } -void ArrayMultiDimensionLiteralsBitMaskPubSubType::deleteData( +void ArrayMultiDimensionLiteralsBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsBitMaskPubSubType::getKey( +bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18522,35 +15458,27 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::getKey( const ArrayMultiDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsBitMask_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 || ArrayMultiDimensionLiteralsBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18563,26 +15491,21 @@ void ArrayMultiDimensionLiteralsBitMaskPubSubType::register_type_object_represen ArrayMultiDimensionLiteralsAliasPubSubType::ArrayMultiDimensionLiteralsAliasPubSubType() { - setName("ArrayMultiDimensionLiteralsAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsAlias::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsAlias_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsAlias"); + uint32_t type_size = ArrayMultiDimensionLiteralsAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsAlias_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsAlias_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsAliasPubSubType::~ArrayMultiDimensionLiteralsAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18600,12 +15523,10 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18620,11 +15541,7 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18641,11 +15558,7 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18662,52 +15575,43 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsAliasPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsAliasPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsAlias()); } -void ArrayMultiDimensionLiteralsAliasPubSubType::deleteData( +void ArrayMultiDimensionLiteralsAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsAliasPubSubType::getKey( +bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18715,35 +15619,27 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::getKey( const ArrayMultiDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsAlias_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 || ArrayMultiDimensionLiteralsAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18756,26 +15652,21 @@ void ArrayMultiDimensionLiteralsAliasPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsSequencePubSubType::ArrayMultiDimensionLiteralsSequencePubSubType() { - setName("ArrayMultiDimensionLiteralsSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsSequence::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsSequence_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsSequence"); + uint32_t type_size = ArrayMultiDimensionLiteralsSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsSequence_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsSequence_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsSequencePubSubType::~ArrayMultiDimensionLiteralsSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18793,12 +15684,10 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18813,11 +15702,7 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18834,11 +15719,7 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18855,52 +15736,43 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsSequencePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsSequencePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsSequence()); } -void ArrayMultiDimensionLiteralsSequencePubSubType::deleteData( +void ArrayMultiDimensionLiteralsSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsSequencePubSubType::getKey( +bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18908,35 +15780,27 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::getKey( const ArrayMultiDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsSequence_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 || ArrayMultiDimensionLiteralsSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18949,26 +15813,21 @@ void ArrayMultiDimensionLiteralsSequencePubSubType::register_type_object_represe ArrayMultiDimensionLiteralsMapPubSubType::ArrayMultiDimensionLiteralsMapPubSubType() { - setName("ArrayMultiDimensionLiteralsMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsMap::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsMap_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsMap"); + uint32_t type_size = ArrayMultiDimensionLiteralsMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsMap_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsMap_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsMapPubSubType::~ArrayMultiDimensionLiteralsMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18986,12 +15845,10 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19006,11 +15863,7 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19027,11 +15880,7 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19048,52 +15897,43 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsMapPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsMapPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsMap()); } -void ArrayMultiDimensionLiteralsMapPubSubType::deleteData( +void ArrayMultiDimensionLiteralsMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsMapPubSubType::getKey( +bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19101,35 +15941,27 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::getKey( const ArrayMultiDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsMap_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 || ArrayMultiDimensionLiteralsMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19142,26 +15974,21 @@ void ArrayMultiDimensionLiteralsMapPubSubType::register_type_object_representati ArrayMultiDimensionLiteralsUnionPubSubType::ArrayMultiDimensionLiteralsUnionPubSubType() { - setName("ArrayMultiDimensionLiteralsUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsUnion::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsUnion_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsUnion"); + uint32_t type_size = ArrayMultiDimensionLiteralsUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsUnion_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsUnion_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsUnionPubSubType::~ArrayMultiDimensionLiteralsUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19179,12 +16006,10 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19199,11 +16024,7 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19220,11 +16041,7 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19241,52 +16058,43 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsUnionPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsUnionPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsUnion()); } -void ArrayMultiDimensionLiteralsUnionPubSubType::deleteData( +void ArrayMultiDimensionLiteralsUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsUnionPubSubType::getKey( +bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19294,35 +16102,27 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::getKey( const ArrayMultiDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsUnion_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 || ArrayMultiDimensionLiteralsUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19335,26 +16135,21 @@ void ArrayMultiDimensionLiteralsUnionPubSubType::register_type_object_representa ArrayMultiDimensionLiteralsStructurePubSubType::ArrayMultiDimensionLiteralsStructurePubSubType() { - setName("ArrayMultiDimensionLiteralsStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsStructure::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsStructure_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsStructure"); + uint32_t type_size = ArrayMultiDimensionLiteralsStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsStructure_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsStructure_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsStructurePubSubType::~ArrayMultiDimensionLiteralsStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19372,12 +16167,10 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19392,11 +16185,7 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19413,11 +16202,7 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19434,52 +16219,43 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsStructurePubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsStructurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsStructurePubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsStructure()); } -void ArrayMultiDimensionLiteralsStructurePubSubType::deleteData( +void ArrayMultiDimensionLiteralsStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsStructurePubSubType::getKey( +bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19487,35 +16263,27 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::getKey( const ArrayMultiDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsStructure_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 || ArrayMultiDimensionLiteralsStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19528,26 +16296,21 @@ void ArrayMultiDimensionLiteralsStructurePubSubType::register_type_object_repres ArrayMultiDimensionLiteralsBitSetPubSubType::ArrayMultiDimensionLiteralsBitSetPubSubType() { - setName("ArrayMultiDimensionLiteralsBitSet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayMultiDimensionLiteralsBitSet::getMaxCdrSerializedSize()); -#else - ArrayMultiDimensionLiteralsBitSet_max_cdr_typesize; -#endif + set_name("ArrayMultiDimensionLiteralsBitSet"); + uint32_t type_size = ArrayMultiDimensionLiteralsBitSet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayMultiDimensionLiteralsBitSet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBitSet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayMultiDimensionLiteralsBitSet_max_key_cdr_typesize > 16 ? ArrayMultiDimensionLiteralsBitSet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayMultiDimensionLiteralsBitSetPubSubType::~ArrayMultiDimensionLiteralsBitSetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19565,12 +16328,10 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19585,11 +16346,7 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19606,11 +16363,7 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19627,52 +16380,43 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::deserialize( return true; } -std::function ArrayMultiDimensionLiteralsBitSetPubSubType::getSerializedSizeProvider( +uint32_t ArrayMultiDimensionLiteralsBitSetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ArrayMultiDimensionLiteralsBitSetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ArrayMultiDimensionLiteralsBitSetPubSubType::create_data() { return reinterpret_cast(new ArrayMultiDimensionLiteralsBitSet()); } -void ArrayMultiDimensionLiteralsBitSetPubSubType::deleteData( +void ArrayMultiDimensionLiteralsBitSetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayMultiDimensionLiteralsBitSetPubSubType::getKey( +bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19680,35 +16424,27 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::getKey( const ArrayMultiDimensionLiteralsBitSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayMultiDimensionLiteralsBitSet_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 || ArrayMultiDimensionLiteralsBitSet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19721,26 +16457,21 @@ void ArrayMultiDimensionLiteralsBitSetPubSubType::register_type_object_represent BoundedSmallArraysPubSubType::BoundedSmallArraysPubSubType() { - setName("BoundedSmallArrays"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedSmallArrays::getMaxCdrSerializedSize()); -#else - BoundedSmallArrays_max_cdr_typesize; -#endif + set_name("BoundedSmallArrays"); + uint32_t type_size = BoundedSmallArrays_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedSmallArrays_max_key_cdr_typesize > 16 ? BoundedSmallArrays_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedSmallArrays_max_key_cdr_typesize > 16 ? BoundedSmallArrays_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedSmallArraysPubSubType::~BoundedSmallArraysPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19758,12 +16489,10 @@ bool BoundedSmallArraysPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19778,11 +16507,7 @@ bool BoundedSmallArraysPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19799,11 +16524,7 @@ bool BoundedSmallArraysPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19820,52 +16541,43 @@ bool BoundedSmallArraysPubSubType::deserialize( return true; } -std::function BoundedSmallArraysPubSubType::getSerializedSizeProvider( +uint32_t BoundedSmallArraysPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BoundedSmallArraysPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BoundedSmallArraysPubSubType::create_data() { return reinterpret_cast(new BoundedSmallArrays()); } -void BoundedSmallArraysPubSubType::deleteData( +void BoundedSmallArraysPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedSmallArraysPubSubType::getKey( +bool BoundedSmallArraysPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19873,35 +16585,27 @@ bool BoundedSmallArraysPubSubType::getKey( const BoundedSmallArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedSmallArrays_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 || BoundedSmallArrays_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19914,26 +16618,21 @@ void BoundedSmallArraysPubSubType::register_type_object_representation() BoundedBigArraysPubSubType::BoundedBigArraysPubSubType() { - setName("BoundedBigArrays"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedBigArrays::getMaxCdrSerializedSize()); -#else - BoundedBigArrays_max_cdr_typesize; -#endif + set_name("BoundedBigArrays"); + uint32_t type_size = BoundedBigArrays_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedBigArrays_max_key_cdr_typesize > 16 ? BoundedBigArrays_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedBigArrays_max_key_cdr_typesize > 16 ? BoundedBigArrays_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedBigArraysPubSubType::~BoundedBigArraysPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19951,12 +16650,10 @@ bool BoundedBigArraysPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19971,11 +16668,7 @@ bool BoundedBigArraysPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19992,11 +16685,7 @@ bool BoundedBigArraysPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20013,52 +16702,43 @@ bool BoundedBigArraysPubSubType::deserialize( return true; } -std::function BoundedBigArraysPubSubType::getSerializedSizeProvider( +uint32_t BoundedBigArraysPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BoundedBigArraysPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BoundedBigArraysPubSubType::create_data() { return reinterpret_cast(new BoundedBigArrays()); } -void BoundedBigArraysPubSubType::deleteData( +void BoundedBigArraysPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedBigArraysPubSubType::getKey( +bool BoundedBigArraysPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20066,35 +16746,27 @@ bool BoundedBigArraysPubSubType::getKey( const BoundedBigArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedBigArrays_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 || BoundedBigArrays_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index f9d15c2408b..18728296f96 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -62,18 +62,18 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2134,18 +2134,18 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2180,8 +2180,8 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2208,18 +2208,18 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2254,8 +2254,8 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2282,18 +2282,18 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2328,8 +2328,8 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2356,18 +2356,18 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2402,8 +2402,8 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2430,18 +2430,18 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2476,8 +2476,8 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2504,18 +2504,18 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2550,8 +2550,8 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2578,18 +2578,18 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2624,8 +2624,8 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2652,18 +2652,18 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2698,8 +2698,8 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2726,18 +2726,18 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2772,8 +2772,8 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2800,18 +2800,18 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2846,8 +2846,8 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2874,18 +2874,18 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2920,8 +2920,8 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2948,18 +2948,18 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2994,8 +2994,8 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3022,18 +3022,18 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3068,8 +3068,8 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3096,18 +3096,18 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3142,8 +3142,8 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3170,18 +3170,18 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3216,8 +3216,8 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3244,18 +3244,18 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3290,8 +3290,8 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3318,18 +3318,18 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3364,8 +3364,8 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3392,18 +3392,18 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3438,8 +3438,8 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3466,18 +3466,18 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3512,8 +3512,8 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3540,18 +3540,18 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3586,8 +3586,8 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3614,18 +3614,18 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3660,8 +3660,8 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3688,18 +3688,18 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3734,8 +3734,8 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3762,18 +3762,18 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3808,8 +3808,8 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3838,18 +3838,18 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3884,8 +3884,8 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3912,18 +3912,18 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3958,8 +3958,8 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3986,18 +3986,18 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4032,8 +4032,8 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4060,18 +4060,18 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4106,8 +4106,8 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4134,18 +4134,18 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4180,8 +4180,8 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4208,18 +4208,18 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4254,8 +4254,8 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4282,18 +4282,18 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4328,8 +4328,8 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4356,18 +4356,18 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4402,8 +4402,8 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4430,18 +4430,18 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4476,8 +4476,8 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4504,18 +4504,18 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4550,8 +4550,8 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4578,18 +4578,18 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4624,8 +4624,8 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4652,18 +4652,18 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4698,8 +4698,8 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4726,18 +4726,18 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4772,8 +4772,8 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4800,18 +4800,18 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4846,8 +4846,8 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4874,18 +4874,18 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4920,8 +4920,8 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4948,18 +4948,18 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4994,8 +4994,8 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5022,18 +5022,18 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5068,8 +5068,8 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5096,18 +5096,18 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5142,8 +5142,8 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5170,18 +5170,18 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5216,8 +5216,8 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5244,18 +5244,18 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5290,8 +5290,8 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5318,18 +5318,18 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5364,8 +5364,8 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5392,18 +5392,18 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5438,8 +5438,8 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5466,18 +5466,18 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5512,8 +5512,8 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5540,18 +5540,18 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5586,8 +5586,8 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5614,18 +5614,18 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5660,8 +5660,8 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5688,18 +5688,18 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5734,8 +5734,8 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5762,18 +5762,18 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5808,8 +5808,8 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5836,18 +5836,18 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5882,8 +5882,8 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5910,18 +5910,18 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5956,8 +5956,8 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5984,18 +5984,18 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6030,8 +6030,8 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6058,18 +6058,18 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6104,8 +6104,8 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6132,18 +6132,18 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6178,8 +6178,8 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6206,18 +6206,18 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6252,8 +6252,8 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6280,18 +6280,18 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6326,8 +6326,8 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6354,18 +6354,18 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6400,8 +6400,8 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6428,18 +6428,18 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6474,8 +6474,8 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6502,18 +6502,18 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6548,8 +6548,8 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6576,18 +6576,18 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6622,8 +6622,8 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6650,18 +6650,18 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6696,8 +6696,8 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6724,18 +6724,18 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6770,8 +6770,8 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6798,18 +6798,18 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6844,8 +6844,8 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6872,18 +6872,18 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6918,8 +6918,8 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6946,18 +6946,18 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6992,8 +6992,8 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7020,18 +7020,18 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7066,8 +7066,8 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7094,18 +7094,18 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7140,8 +7140,8 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7168,18 +7168,18 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7214,8 +7214,8 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7242,18 +7242,18 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7288,8 +7288,8 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7316,18 +7316,18 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7362,8 +7362,8 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7390,18 +7390,18 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7436,8 +7436,8 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7464,18 +7464,18 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7510,8 +7510,8 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7538,18 +7538,18 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7584,8 +7584,8 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7612,18 +7612,18 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7658,8 +7658,8 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7686,18 +7686,18 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7732,8 +7732,8 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/bitsetsPubSubTypes.cxx b/test/dds-types-test/bitsetsPubSubTypes.cxx index c5d91cc1dd7..36d915df7fe 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.cxx +++ b/test/dds-types-test/bitsetsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; BitsetStructPubSubType::BitsetStructPubSubType() { - setName("BitsetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BitsetStruct::getMaxCdrSerializedSize()); -#else - BitsetStruct_max_cdr_typesize; -#endif + set_name("BitsetStruct"); + uint32_t type_size = BitsetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BitsetStruct_max_key_cdr_typesize > 16 ? BitsetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BitsetStruct_max_key_cdr_typesize > 16 ? BitsetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BitsetStructPubSubType::~BitsetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool BitsetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool BitsetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool BitsetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool BitsetStructPubSubType::deserialize( return true; } -std::function BitsetStructPubSubType::getSerializedSizeProvider( +uint32_t BitsetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BitsetStructPubSubType::createData() +void* BitsetStructPubSubType::create_data() { return reinterpret_cast(new BitsetStruct()); } -void BitsetStructPubSubType::deleteData( +void BitsetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BitsetStructPubSubType::getKey( +bool BitsetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool BitsetStructPubSubType::getKey( const BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BitsetStruct_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 || BitsetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index 200084b2545..f0d9b4f2ef6 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -62,18 +62,18 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/constantsPubSubTypes.cxx b/test/dds-types-test/constantsPubSubTypes.cxx index 6ef0459d6e6..0069b77ba0e 100644 --- a/test/dds-types-test/constantsPubSubTypes.cxx +++ b/test/dds-types-test/constantsPubSubTypes.cxx @@ -34,26 +34,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace const_module1 { ModuleConstsLiteralsStructPubSubType::ModuleConstsLiteralsStructPubSubType() { - setName("const_module1::ModuleConstsLiteralsStruct"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(ModuleConstsLiteralsStruct::getMaxCdrSerializedSize()); - #else - const_module1_ModuleConstsLiteralsStruct_max_cdr_typesize; - #endif + set_name("const_module1::ModuleConstsLiteralsStruct"); + uint32_t type_size = const_module1_ModuleConstsLiteralsStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = const_module1_ModuleConstsLiteralsStruct_max_key_cdr_typesize > 16 ? const_module1_ModuleConstsLiteralsStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = const_module1_ModuleConstsLiteralsStruct_max_key_cdr_typesize > 16 ? const_module1_ModuleConstsLiteralsStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ModuleConstsLiteralsStructPubSubType::~ModuleConstsLiteralsStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -71,12 +66,10 @@ namespace const_module1 { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -91,11 +84,7 @@ namespace const_module1 { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -112,11 +101,7 @@ namespace const_module1 { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -133,52 +118,43 @@ namespace const_module1 { return true; } - std::function ModuleConstsLiteralsStructPubSubType::getSerializedSizeProvider( + uint32_t ModuleConstsLiteralsStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ModuleConstsLiteralsStructPubSubType::createData() + void* ModuleConstsLiteralsStructPubSubType::create_data() { return reinterpret_cast(new ModuleConstsLiteralsStruct()); } - void ModuleConstsLiteralsStructPubSubType::deleteData( + void ModuleConstsLiteralsStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ModuleConstsLiteralsStructPubSubType::getKey( + bool ModuleConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -186,35 +162,27 @@ namespace const_module1 { const ModuleConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), const_module1_ModuleConstsLiteralsStruct_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 || const_module1_ModuleConstsLiteralsStruct_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -230,26 +198,21 @@ namespace const_module1 { namespace const_module2 { Module2ConstsLiteralsStructPubSubType::Module2ConstsLiteralsStructPubSubType() { - setName("const_module2::Module2ConstsLiteralsStruct"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(Module2ConstsLiteralsStruct::getMaxCdrSerializedSize()); - #else - const_module2_Module2ConstsLiteralsStruct_max_cdr_typesize; - #endif + set_name("const_module2::Module2ConstsLiteralsStruct"); + uint32_t type_size = const_module2_Module2ConstsLiteralsStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = const_module2_Module2ConstsLiteralsStruct_max_key_cdr_typesize > 16 ? const_module2_Module2ConstsLiteralsStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = const_module2_Module2ConstsLiteralsStruct_max_key_cdr_typesize > 16 ? const_module2_Module2ConstsLiteralsStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Module2ConstsLiteralsStructPubSubType::~Module2ConstsLiteralsStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -267,12 +230,10 @@ namespace const_module2 { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -287,11 +248,7 @@ namespace const_module2 { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -308,11 +265,7 @@ namespace const_module2 { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -329,52 +282,43 @@ namespace const_module2 { return true; } - std::function Module2ConstsLiteralsStructPubSubType::getSerializedSizeProvider( + uint32_t Module2ConstsLiteralsStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* Module2ConstsLiteralsStructPubSubType::createData() + void* Module2ConstsLiteralsStructPubSubType::create_data() { return reinterpret_cast(new Module2ConstsLiteralsStruct()); } - void Module2ConstsLiteralsStructPubSubType::deleteData( + void Module2ConstsLiteralsStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool Module2ConstsLiteralsStructPubSubType::getKey( + bool Module2ConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -382,35 +326,27 @@ namespace const_module2 { const Module2ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), const_module2_Module2ConstsLiteralsStruct_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 || const_module2_Module2ConstsLiteralsStruct_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -425,26 +361,21 @@ namespace const_module2 { ConstsLiteralsStructPubSubType::ConstsLiteralsStructPubSubType() { - setName("ConstsLiteralsStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ConstsLiteralsStruct::getMaxCdrSerializedSize()); -#else - ConstsLiteralsStruct_max_cdr_typesize; -#endif + set_name("ConstsLiteralsStruct"); + uint32_t type_size = ConstsLiteralsStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ConstsLiteralsStruct_max_key_cdr_typesize > 16 ? ConstsLiteralsStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ConstsLiteralsStruct_max_key_cdr_typesize > 16 ? ConstsLiteralsStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ConstsLiteralsStructPubSubType::~ConstsLiteralsStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -462,12 +393,10 @@ bool ConstsLiteralsStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -482,11 +411,7 @@ bool ConstsLiteralsStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -503,11 +428,7 @@ bool ConstsLiteralsStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -524,52 +445,43 @@ bool ConstsLiteralsStructPubSubType::deserialize( return true; } -std::function ConstsLiteralsStructPubSubType::getSerializedSizeProvider( +uint32_t ConstsLiteralsStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ConstsLiteralsStructPubSubType::createData() +void* ConstsLiteralsStructPubSubType::create_data() { return reinterpret_cast(new ConstsLiteralsStruct()); } -void ConstsLiteralsStructPubSubType::deleteData( +void ConstsLiteralsStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ConstsLiteralsStructPubSubType::getKey( +bool ConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -577,35 +489,27 @@ bool ConstsLiteralsStructPubSubType::getKey( const ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ConstsLiteralsStruct_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 || ConstsLiteralsStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index 18a50f66b75..e2969ef36f5 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -68,18 +68,18 @@ namespace const_module1 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -114,8 +114,8 @@ namespace const_module1 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace const_module1 @@ -145,18 +145,18 @@ namespace const_module2 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,8 +191,8 @@ namespace const_module2 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace const_module2 @@ -220,18 +220,18 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -266,8 +266,8 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/declarationsPubSubTypes.cxx b/test/dds-types-test/declarationsPubSubTypes.cxx index 6c060c36f7d..0a64195ad81 100644 --- a/test/dds-types-test/declarationsPubSubTypes.cxx +++ b/test/dds-types-test/declarationsPubSubTypes.cxx @@ -31,26 +31,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ForwardDeclarationsRecursiveStructPubSubType::ForwardDeclarationsRecursiveStructPubSubType() { - setName("ForwardDeclarationsRecursiveStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ForwardDeclarationsRecursiveStruct::getMaxCdrSerializedSize()); -#else - ForwardDeclarationsRecursiveStruct_max_cdr_typesize; -#endif + set_name("ForwardDeclarationsRecursiveStruct"); + uint32_t type_size = ForwardDeclarationsRecursiveStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16 ? ForwardDeclarationsRecursiveStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16 ? ForwardDeclarationsRecursiveStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ForwardDeclarationsRecursiveStructPubSubType::~ForwardDeclarationsRecursiveStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -68,12 +63,10 @@ bool ForwardDeclarationsRecursiveStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -88,11 +81,7 @@ bool ForwardDeclarationsRecursiveStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -109,11 +98,7 @@ bool ForwardDeclarationsRecursiveStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -130,52 +115,43 @@ bool ForwardDeclarationsRecursiveStructPubSubType::deserialize( return true; } -std::function ForwardDeclarationsRecursiveStructPubSubType::getSerializedSizeProvider( +uint32_t ForwardDeclarationsRecursiveStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ForwardDeclarationsRecursiveStructPubSubType::createData() +void* ForwardDeclarationsRecursiveStructPubSubType::create_data() { return reinterpret_cast(new ForwardDeclarationsRecursiveStruct()); } -void ForwardDeclarationsRecursiveStructPubSubType::deleteData( +void ForwardDeclarationsRecursiveStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ForwardDeclarationsRecursiveStructPubSubType::getKey( +bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -183,35 +159,27 @@ bool ForwardDeclarationsRecursiveStructPubSubType::getKey( const ForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ForwardDeclarationsRecursiveStruct_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 || ForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void ForwardDeclarationsRecursiveStructPubSubType::register_type_object_represen ForwardStructPubSubType::ForwardStructPubSubType() { - setName("ForwardStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ForwardStruct::getMaxCdrSerializedSize()); -#else - ForwardStruct_max_cdr_typesize; -#endif + set_name("ForwardStruct"); + uint32_t type_size = ForwardStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ForwardStruct_max_key_cdr_typesize > 16 ? ForwardStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ForwardStruct_max_key_cdr_typesize > 16 ? ForwardStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ForwardStructPubSubType::~ForwardStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool ForwardStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool ForwardStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool ForwardStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool ForwardStructPubSubType::deserialize( return true; } -std::function ForwardStructPubSubType::getSerializedSizeProvider( +uint32_t ForwardStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ForwardStructPubSubType::createData() +void* ForwardStructPubSubType::create_data() { return reinterpret_cast(new ForwardStruct()); } -void ForwardStructPubSubType::deleteData( +void ForwardStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ForwardStructPubSubType::getKey( +bool ForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool ForwardStructPubSubType::getKey( const ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ForwardStruct_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 || ForwardStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -421,26 +357,21 @@ void ForwardStructPubSubType::register_type_object_representation() namespace declarations_module { ForwardStructPubSubType::ForwardStructPubSubType() { - setName("declarations_module::ForwardStruct"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(ForwardStruct::getMaxCdrSerializedSize()); - #else - declarations_module_ForwardStruct_max_cdr_typesize; - #endif + set_name("declarations_module::ForwardStruct"); + uint32_t type_size = declarations_module_ForwardStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = declarations_module_ForwardStruct_max_key_cdr_typesize > 16 ? declarations_module_ForwardStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = declarations_module_ForwardStruct_max_key_cdr_typesize > 16 ? declarations_module_ForwardStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ForwardStructPubSubType::~ForwardStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -458,12 +389,10 @@ namespace declarations_module { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -478,11 +407,7 @@ namespace declarations_module { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -499,11 +424,7 @@ namespace declarations_module { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -520,52 +441,43 @@ namespace declarations_module { return true; } - std::function ForwardStructPubSubType::getSerializedSizeProvider( + uint32_t ForwardStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ForwardStructPubSubType::createData() + void* ForwardStructPubSubType::create_data() { return reinterpret_cast(new ForwardStruct()); } - void ForwardStructPubSubType::deleteData( + void ForwardStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ForwardStructPubSubType::getKey( + bool ForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -573,35 +485,27 @@ namespace declarations_module { const ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), declarations_module_ForwardStruct_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 || declarations_module_ForwardStruct_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -617,26 +521,21 @@ namespace declarations_module { ModuledForwardDeclarationsRecursiveStructPubSubType::ModuledForwardDeclarationsRecursiveStructPubSubType() { - setName("ModuledForwardDeclarationsRecursiveStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ModuledForwardDeclarationsRecursiveStruct::getMaxCdrSerializedSize()); -#else - ModuledForwardDeclarationsRecursiveStruct_max_cdr_typesize; -#endif + set_name("ModuledForwardDeclarationsRecursiveStruct"); + uint32_t type_size = ModuledForwardDeclarationsRecursiveStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ModuledForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16 ? ModuledForwardDeclarationsRecursiveStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ModuledForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16 ? ModuledForwardDeclarationsRecursiveStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ModuledForwardDeclarationsRecursiveStructPubSubType::~ModuledForwardDeclarationsRecursiveStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -654,12 +553,10 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -674,11 +571,7 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -695,11 +588,7 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -716,52 +605,43 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::deserialize( return true; } -std::function ModuledForwardDeclarationsRecursiveStructPubSubType::getSerializedSizeProvider( +uint32_t ModuledForwardDeclarationsRecursiveStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ModuledForwardDeclarationsRecursiveStructPubSubType::createData() +void* ModuledForwardDeclarationsRecursiveStructPubSubType::create_data() { return reinterpret_cast(new ModuledForwardDeclarationsRecursiveStruct()); } -void ModuledForwardDeclarationsRecursiveStructPubSubType::deleteData( +void ModuledForwardDeclarationsRecursiveStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ModuledForwardDeclarationsRecursiveStructPubSubType::getKey( +bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -769,35 +649,27 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::getKey( const ModuledForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ModuledForwardDeclarationsRecursiveStruct_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 || ModuledForwardDeclarationsRecursiveStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -812,26 +684,21 @@ void ModuledForwardDeclarationsRecursiveStructPubSubType::register_type_object_r namespace declarations_module { ModuledForwardStructPubSubType::ModuledForwardStructPubSubType() { - setName("declarations_module::ModuledForwardStruct"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(ModuledForwardStruct::getMaxCdrSerializedSize()); - #else - declarations_module_ModuledForwardStruct_max_cdr_typesize; - #endif + set_name("declarations_module::ModuledForwardStruct"); + uint32_t type_size = declarations_module_ModuledForwardStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = declarations_module_ModuledForwardStruct_max_key_cdr_typesize > 16 ? declarations_module_ModuledForwardStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = declarations_module_ModuledForwardStruct_max_key_cdr_typesize > 16 ? declarations_module_ModuledForwardStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ModuledForwardStructPubSubType::~ModuledForwardStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -849,12 +716,10 @@ namespace declarations_module { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -869,11 +734,7 @@ namespace declarations_module { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -890,11 +751,7 @@ namespace declarations_module { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -911,52 +768,43 @@ namespace declarations_module { return true; } - std::function ModuledForwardStructPubSubType::getSerializedSizeProvider( + uint32_t ModuledForwardStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } - void* ModuledForwardStructPubSubType::createData() + void* ModuledForwardStructPubSubType::create_data() { return reinterpret_cast(new ModuledForwardStruct()); } - void ModuledForwardStructPubSubType::deleteData( + void ModuledForwardStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool ModuledForwardStructPubSubType::getKey( + bool ModuledForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -964,35 +812,27 @@ namespace declarations_module { const ModuledForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), declarations_module_ModuledForwardStruct_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 || declarations_module_ModuledForwardStruct_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1010,26 +850,21 @@ namespace declarations_module { ModuledCommonNameStructurePubSubType::ModuledCommonNameStructurePubSubType() { - setName("ModuledCommonNameStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ModuledCommonNameStructure::getMaxCdrSerializedSize()); -#else - ModuledCommonNameStructure_max_cdr_typesize; -#endif + set_name("ModuledCommonNameStructure"); + uint32_t type_size = ModuledCommonNameStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ModuledCommonNameStructure_max_key_cdr_typesize > 16 ? ModuledCommonNameStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ModuledCommonNameStructure_max_key_cdr_typesize > 16 ? ModuledCommonNameStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ModuledCommonNameStructurePubSubType::~ModuledCommonNameStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1047,12 +882,10 @@ bool ModuledCommonNameStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1067,11 +900,7 @@ bool ModuledCommonNameStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1088,11 +917,7 @@ bool ModuledCommonNameStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1109,52 +934,43 @@ bool ModuledCommonNameStructurePubSubType::deserialize( return true; } -std::function ModuledCommonNameStructurePubSubType::getSerializedSizeProvider( +uint32_t ModuledCommonNameStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ModuledCommonNameStructurePubSubType::createData() +void* ModuledCommonNameStructurePubSubType::create_data() { return reinterpret_cast(new ModuledCommonNameStructure()); } -void ModuledCommonNameStructurePubSubType::deleteData( +void ModuledCommonNameStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ModuledCommonNameStructurePubSubType::getKey( +bool ModuledCommonNameStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1162,35 +978,27 @@ bool ModuledCommonNameStructurePubSubType::getKey( const ModuledCommonNameStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ModuledCommonNameStructure_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 || ModuledCommonNameStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index 352b9b9e731..c7bb8d9ac7d 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -66,18 +66,18 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -112,8 +112,8 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -141,18 +141,18 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -187,8 +187,8 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace declarations_module @@ -221,18 +221,18 @@ namespace declarations_module eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -267,8 +267,8 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace declarations_module @@ -296,18 +296,18 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -342,8 +342,8 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace declarations_module @@ -372,18 +372,18 @@ namespace declarations_module eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -418,8 +418,8 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -449,18 +449,18 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -495,8 +495,8 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/enumerationsPubSubTypes.cxx b/test/dds-types-test/enumerationsPubSubTypes.cxx index 3ce6ab2b8ce..73b729e361a 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.cxx +++ b/test/dds-types-test/enumerationsPubSubTypes.cxx @@ -36,26 +36,21 @@ namespace Test { EnumStructurePubSubType::EnumStructurePubSubType() { - setName("EnumStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(EnumStructure::getMaxCdrSerializedSize()); -#else - EnumStructure_max_cdr_typesize; -#endif + set_name("EnumStructure"); + uint32_t type_size = EnumStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = EnumStructure_max_key_cdr_typesize > 16 ? EnumStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = EnumStructure_max_key_cdr_typesize > 16 ? EnumStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EnumStructurePubSubType::~EnumStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -73,12 +68,10 @@ bool EnumStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -93,11 +86,7 @@ bool EnumStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -114,11 +103,7 @@ bool EnumStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -135,52 +120,43 @@ bool EnumStructurePubSubType::deserialize( return true; } -std::function EnumStructurePubSubType::getSerializedSizeProvider( +uint32_t EnumStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* EnumStructurePubSubType::createData() +void* EnumStructurePubSubType::create_data() { return reinterpret_cast(new EnumStructure()); } -void EnumStructurePubSubType::deleteData( +void EnumStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool EnumStructurePubSubType::getKey( +bool EnumStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -188,35 +164,27 @@ bool EnumStructurePubSubType::getKey( const EnumStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), EnumStructure_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 || EnumStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -229,26 +197,21 @@ void EnumStructurePubSubType::register_type_object_representation() BitMaskStructurePubSubType::BitMaskStructurePubSubType() { - setName("BitMaskStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BitMaskStructure::getMaxCdrSerializedSize()); -#else - BitMaskStructure_max_cdr_typesize; -#endif + set_name("BitMaskStructure"); + uint32_t type_size = BitMaskStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BitMaskStructure_max_key_cdr_typesize > 16 ? BitMaskStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BitMaskStructure_max_key_cdr_typesize > 16 ? BitMaskStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BitMaskStructurePubSubType::~BitMaskStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -266,12 +229,10 @@ bool BitMaskStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -286,11 +247,7 @@ bool BitMaskStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -307,11 +264,7 @@ bool BitMaskStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -328,52 +281,43 @@ bool BitMaskStructurePubSubType::deserialize( return true; } -std::function BitMaskStructurePubSubType::getSerializedSizeProvider( +uint32_t BitMaskStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BitMaskStructurePubSubType::createData() +void* BitMaskStructurePubSubType::create_data() { return reinterpret_cast(new BitMaskStructure()); } -void BitMaskStructurePubSubType::deleteData( +void BitMaskStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BitMaskStructurePubSubType::getKey( +bool BitMaskStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -381,35 +325,27 @@ bool BitMaskStructurePubSubType::getKey( const BitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BitMaskStructure_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 || BitMaskStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -422,26 +358,21 @@ void BitMaskStructurePubSubType::register_type_object_representation() BoundedBitMaskStructurePubSubType::BoundedBitMaskStructurePubSubType() { - setName("BoundedBitMaskStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedBitMaskStructure::getMaxCdrSerializedSize()); -#else - BoundedBitMaskStructure_max_cdr_typesize; -#endif + set_name("BoundedBitMaskStructure"); + uint32_t type_size = BoundedBitMaskStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedBitMaskStructure_max_key_cdr_typesize > 16 ? BoundedBitMaskStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedBitMaskStructure_max_key_cdr_typesize > 16 ? BoundedBitMaskStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedBitMaskStructurePubSubType::~BoundedBitMaskStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -459,12 +390,10 @@ bool BoundedBitMaskStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -479,11 +408,7 @@ bool BoundedBitMaskStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -500,11 +425,7 @@ bool BoundedBitMaskStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -521,52 +442,43 @@ bool BoundedBitMaskStructurePubSubType::deserialize( return true; } -std::function BoundedBitMaskStructurePubSubType::getSerializedSizeProvider( +uint32_t BoundedBitMaskStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BoundedBitMaskStructurePubSubType::createData() +void* BoundedBitMaskStructurePubSubType::create_data() { return reinterpret_cast(new BoundedBitMaskStructure()); } -void BoundedBitMaskStructurePubSubType::deleteData( +void BoundedBitMaskStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedBitMaskStructurePubSubType::getKey( +bool BoundedBitMaskStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -574,35 +486,27 @@ bool BoundedBitMaskStructurePubSubType::getKey( const BoundedBitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedBitMaskStructure_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 || BoundedBitMaskStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index e8230378cd2..3b25d7b091b 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -65,18 +65,18 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -111,8 +111,8 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -139,18 +139,18 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -185,8 +185,8 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -213,18 +213,18 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -259,8 +259,8 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/externalPubSubTypes.cxx b/test/dds-types-test/externalPubSubTypes.cxx index 2c136fe9f45..f3a21efb555 100644 --- a/test/dds-types-test/externalPubSubTypes.cxx +++ b/test/dds-types-test/externalPubSubTypes.cxx @@ -31,26 +31,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; short_externalPubSubType::short_externalPubSubType() { - setName("short_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(short_external::getMaxCdrSerializedSize()); -#else - short_external_max_cdr_typesize; -#endif + set_name("short_external"); + uint32_t type_size = short_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = short_external_max_key_cdr_typesize > 16 ? short_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = short_external_max_key_cdr_typesize > 16 ? short_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } short_externalPubSubType::~short_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -68,12 +63,10 @@ bool short_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -88,11 +81,7 @@ bool short_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -109,11 +98,7 @@ bool short_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -130,52 +115,43 @@ bool short_externalPubSubType::deserialize( return true; } -std::function short_externalPubSubType::getSerializedSizeProvider( +uint32_t short_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* short_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* short_externalPubSubType::create_data() { return reinterpret_cast(new short_external()); } -void short_externalPubSubType::deleteData( +void short_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool short_externalPubSubType::getKey( +bool short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -183,35 +159,27 @@ bool short_externalPubSubType::getKey( const short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), short_external_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 || short_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -225,26 +193,21 @@ void short_externalPubSubType::register_type_object_representation() ushort_externalPubSubType::ushort_externalPubSubType() { - setName("ushort_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ushort_external::getMaxCdrSerializedSize()); -#else - ushort_external_max_cdr_typesize; -#endif + set_name("ushort_external"); + uint32_t type_size = ushort_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ushort_external_max_key_cdr_typesize > 16 ? ushort_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ushort_external_max_key_cdr_typesize > 16 ? ushort_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ushort_externalPubSubType::~ushort_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -262,12 +225,10 @@ bool ushort_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -282,11 +243,7 @@ bool ushort_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -303,11 +260,7 @@ bool ushort_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -324,52 +277,43 @@ bool ushort_externalPubSubType::deserialize( return true; } -std::function ushort_externalPubSubType::getSerializedSizeProvider( +uint32_t ushort_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ushort_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ushort_externalPubSubType::create_data() { return reinterpret_cast(new ushort_external()); } -void ushort_externalPubSubType::deleteData( +void ushort_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ushort_externalPubSubType::getKey( +bool ushort_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -377,35 +321,27 @@ bool ushort_externalPubSubType::getKey( const ushort_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ushort_external_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 || ushort_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void ushort_externalPubSubType::register_type_object_representation() long_externalPubSubType::long_externalPubSubType() { - setName("long_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(long_external::getMaxCdrSerializedSize()); -#else - long_external_max_cdr_typesize; -#endif + set_name("long_external"); + uint32_t type_size = long_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = long_external_max_key_cdr_typesize > 16 ? long_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = long_external_max_key_cdr_typesize > 16 ? long_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } long_externalPubSubType::~long_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool long_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool long_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool long_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool long_externalPubSubType::deserialize( return true; } -std::function long_externalPubSubType::getSerializedSizeProvider( +uint32_t long_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* long_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* long_externalPubSubType::create_data() { return reinterpret_cast(new long_external()); } -void long_externalPubSubType::deleteData( +void long_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool long_externalPubSubType::getKey( +bool long_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool long_externalPubSubType::getKey( const long_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), long_external_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 || long_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -613,26 +517,21 @@ void long_externalPubSubType::register_type_object_representation() ulong_externalPubSubType::ulong_externalPubSubType() { - setName("ulong_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulong_external::getMaxCdrSerializedSize()); -#else - ulong_external_max_cdr_typesize; -#endif + set_name("ulong_external"); + uint32_t type_size = ulong_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulong_external_max_key_cdr_typesize > 16 ? ulong_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulong_external_max_key_cdr_typesize > 16 ? ulong_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulong_externalPubSubType::~ulong_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -650,12 +549,10 @@ bool ulong_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -670,11 +567,7 @@ bool ulong_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -691,11 +584,7 @@ bool ulong_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -712,52 +601,43 @@ bool ulong_externalPubSubType::deserialize( return true; } -std::function ulong_externalPubSubType::getSerializedSizeProvider( +uint32_t ulong_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ulong_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ulong_externalPubSubType::create_data() { return reinterpret_cast(new ulong_external()); } -void ulong_externalPubSubType::deleteData( +void ulong_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulong_externalPubSubType::getKey( +bool ulong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -765,35 +645,27 @@ bool ulong_externalPubSubType::getKey( const ulong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulong_external_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 || ulong_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -807,26 +679,21 @@ void ulong_externalPubSubType::register_type_object_representation() longlong_externalPubSubType::longlong_externalPubSubType() { - setName("longlong_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longlong_external::getMaxCdrSerializedSize()); -#else - longlong_external_max_cdr_typesize; -#endif + set_name("longlong_external"); + uint32_t type_size = longlong_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longlong_external_max_key_cdr_typesize > 16 ? longlong_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longlong_external_max_key_cdr_typesize > 16 ? longlong_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longlong_externalPubSubType::~longlong_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -844,12 +711,10 @@ bool longlong_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -864,11 +729,7 @@ bool longlong_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -885,11 +746,7 @@ bool longlong_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -906,52 +763,43 @@ bool longlong_externalPubSubType::deserialize( return true; } -std::function longlong_externalPubSubType::getSerializedSizeProvider( +uint32_t longlong_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* longlong_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* longlong_externalPubSubType::create_data() { return reinterpret_cast(new longlong_external()); } -void longlong_externalPubSubType::deleteData( +void longlong_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longlong_externalPubSubType::getKey( +bool longlong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -959,35 +807,27 @@ bool longlong_externalPubSubType::getKey( const longlong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longlong_external_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 || longlong_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1001,26 +841,21 @@ void longlong_externalPubSubType::register_type_object_representation() ulonglong_externalPubSubType::ulonglong_externalPubSubType() { - setName("ulonglong_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulonglong_external::getMaxCdrSerializedSize()); -#else - ulonglong_external_max_cdr_typesize; -#endif + set_name("ulonglong_external"); + uint32_t type_size = ulonglong_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulonglong_external_max_key_cdr_typesize > 16 ? ulonglong_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulonglong_external_max_key_cdr_typesize > 16 ? ulonglong_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulonglong_externalPubSubType::~ulonglong_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1038,12 +873,10 @@ bool ulonglong_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1058,11 +891,7 @@ bool ulonglong_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1079,11 +908,7 @@ bool ulonglong_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1100,52 +925,43 @@ bool ulonglong_externalPubSubType::deserialize( return true; } -std::function ulonglong_externalPubSubType::getSerializedSizeProvider( +uint32_t ulonglong_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ulonglong_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ulonglong_externalPubSubType::create_data() { return reinterpret_cast(new ulonglong_external()); } -void ulonglong_externalPubSubType::deleteData( +void ulonglong_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulonglong_externalPubSubType::getKey( +bool ulonglong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1153,35 +969,27 @@ bool ulonglong_externalPubSubType::getKey( const ulonglong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulonglong_external_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 || ulonglong_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1195,26 +1003,21 @@ void ulonglong_externalPubSubType::register_type_object_representation() float_externalPubSubType::float_externalPubSubType() { - setName("float_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(float_external::getMaxCdrSerializedSize()); -#else - float_external_max_cdr_typesize; -#endif + set_name("float_external"); + uint32_t type_size = float_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = float_external_max_key_cdr_typesize > 16 ? float_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = float_external_max_key_cdr_typesize > 16 ? float_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } float_externalPubSubType::~float_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1232,12 +1035,10 @@ bool float_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1252,11 +1053,7 @@ bool float_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1273,11 +1070,7 @@ bool float_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1294,52 +1087,43 @@ bool float_externalPubSubType::deserialize( return true; } -std::function float_externalPubSubType::getSerializedSizeProvider( +uint32_t float_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* float_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* float_externalPubSubType::create_data() { return reinterpret_cast(new float_external()); } -void float_externalPubSubType::deleteData( +void float_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool float_externalPubSubType::getKey( +bool float_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1347,35 +1131,27 @@ bool float_externalPubSubType::getKey( const float_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), float_external_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 || float_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1389,26 +1165,21 @@ void float_externalPubSubType::register_type_object_representation() double_externalPubSubType::double_externalPubSubType() { - setName("double_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(double_external::getMaxCdrSerializedSize()); -#else - double_external_max_cdr_typesize; -#endif + set_name("double_external"); + uint32_t type_size = double_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = double_external_max_key_cdr_typesize > 16 ? double_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = double_external_max_key_cdr_typesize > 16 ? double_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } double_externalPubSubType::~double_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1426,12 +1197,10 @@ bool double_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1446,11 +1215,7 @@ bool double_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1467,11 +1232,7 @@ bool double_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1488,52 +1249,43 @@ bool double_externalPubSubType::deserialize( return true; } -std::function double_externalPubSubType::getSerializedSizeProvider( +uint32_t double_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* double_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* double_externalPubSubType::create_data() { return reinterpret_cast(new double_external()); } -void double_externalPubSubType::deleteData( +void double_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool double_externalPubSubType::getKey( +bool double_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1541,35 +1293,27 @@ bool double_externalPubSubType::getKey( const double_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), double_external_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 || double_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1583,26 +1327,21 @@ void double_externalPubSubType::register_type_object_representation() longdouble_externalPubSubType::longdouble_externalPubSubType() { - setName("longdouble_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longdouble_external::getMaxCdrSerializedSize()); -#else - longdouble_external_max_cdr_typesize; -#endif + set_name("longdouble_external"); + uint32_t type_size = longdouble_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longdouble_external_max_key_cdr_typesize > 16 ? longdouble_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longdouble_external_max_key_cdr_typesize > 16 ? longdouble_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longdouble_externalPubSubType::~longdouble_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1620,12 +1359,10 @@ bool longdouble_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1640,11 +1377,7 @@ bool longdouble_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1661,11 +1394,7 @@ bool longdouble_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1682,52 +1411,43 @@ bool longdouble_externalPubSubType::deserialize( return true; } -std::function longdouble_externalPubSubType::getSerializedSizeProvider( +uint32_t longdouble_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* longdouble_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* longdouble_externalPubSubType::create_data() { return reinterpret_cast(new longdouble_external()); } -void longdouble_externalPubSubType::deleteData( +void longdouble_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longdouble_externalPubSubType::getKey( +bool longdouble_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1735,35 +1455,27 @@ bool longdouble_externalPubSubType::getKey( const longdouble_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longdouble_external_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 || longdouble_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1777,26 +1489,21 @@ void longdouble_externalPubSubType::register_type_object_representation() boolean_externalPubSubType::boolean_externalPubSubType() { - setName("boolean_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(boolean_external::getMaxCdrSerializedSize()); -#else - boolean_external_max_cdr_typesize; -#endif + set_name("boolean_external"); + uint32_t type_size = boolean_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = boolean_external_max_key_cdr_typesize > 16 ? boolean_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = boolean_external_max_key_cdr_typesize > 16 ? boolean_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } boolean_externalPubSubType::~boolean_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1814,12 +1521,10 @@ bool boolean_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1834,11 +1539,7 @@ bool boolean_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1855,11 +1556,7 @@ bool boolean_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1876,52 +1573,43 @@ bool boolean_externalPubSubType::deserialize( return true; } -std::function boolean_externalPubSubType::getSerializedSizeProvider( +uint32_t boolean_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* boolean_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* boolean_externalPubSubType::create_data() { return reinterpret_cast(new boolean_external()); } -void boolean_externalPubSubType::deleteData( +void boolean_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool boolean_externalPubSubType::getKey( +bool boolean_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1929,35 +1617,27 @@ bool boolean_externalPubSubType::getKey( const boolean_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), boolean_external_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 || boolean_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1971,26 +1651,21 @@ void boolean_externalPubSubType::register_type_object_representation() octet_externalPubSubType::octet_externalPubSubType() { - setName("octet_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(octet_external::getMaxCdrSerializedSize()); -#else - octet_external_max_cdr_typesize; -#endif + set_name("octet_external"); + uint32_t type_size = octet_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = octet_external_max_key_cdr_typesize > 16 ? octet_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = octet_external_max_key_cdr_typesize > 16 ? octet_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } octet_externalPubSubType::~octet_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2008,12 +1683,10 @@ bool octet_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2028,11 +1701,7 @@ bool octet_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2049,11 +1718,7 @@ bool octet_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2070,52 +1735,43 @@ bool octet_externalPubSubType::deserialize( return true; } -std::function octet_externalPubSubType::getSerializedSizeProvider( +uint32_t octet_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* octet_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* octet_externalPubSubType::create_data() { return reinterpret_cast(new octet_external()); } -void octet_externalPubSubType::deleteData( +void octet_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool octet_externalPubSubType::getKey( +bool octet_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2123,35 +1779,27 @@ bool octet_externalPubSubType::getKey( const octet_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), octet_external_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 || octet_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2165,26 +1813,21 @@ void octet_externalPubSubType::register_type_object_representation() char_externalPubSubType::char_externalPubSubType() { - setName("char_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(char_external::getMaxCdrSerializedSize()); -#else - char_external_max_cdr_typesize; -#endif + set_name("char_external"); + uint32_t type_size = char_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = char_external_max_key_cdr_typesize > 16 ? char_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = char_external_max_key_cdr_typesize > 16 ? char_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } char_externalPubSubType::~char_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2202,12 +1845,10 @@ bool char_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2222,11 +1863,7 @@ bool char_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2243,11 +1880,7 @@ bool char_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2264,52 +1897,43 @@ bool char_externalPubSubType::deserialize( return true; } -std::function char_externalPubSubType::getSerializedSizeProvider( +uint32_t char_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* char_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* char_externalPubSubType::create_data() { return reinterpret_cast(new char_external()); } -void char_externalPubSubType::deleteData( +void char_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool char_externalPubSubType::getKey( +bool char_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2317,35 +1941,27 @@ bool char_externalPubSubType::getKey( const char_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), char_external_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 || char_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2359,26 +1975,21 @@ void char_externalPubSubType::register_type_object_representation() wchar_externalPubSubType::wchar_externalPubSubType() { - setName("wchar_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(wchar_external::getMaxCdrSerializedSize()); -#else - wchar_external_max_cdr_typesize; -#endif + set_name("wchar_external"); + uint32_t type_size = wchar_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = wchar_external_max_key_cdr_typesize > 16 ? wchar_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = wchar_external_max_key_cdr_typesize > 16 ? wchar_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } wchar_externalPubSubType::~wchar_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2396,12 +2007,10 @@ bool wchar_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2416,11 +2025,7 @@ bool wchar_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2437,11 +2042,7 @@ bool wchar_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2458,52 +2059,43 @@ bool wchar_externalPubSubType::deserialize( return true; } -std::function wchar_externalPubSubType::getSerializedSizeProvider( +uint32_t wchar_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* wchar_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* wchar_externalPubSubType::create_data() { return reinterpret_cast(new wchar_external()); } -void wchar_externalPubSubType::deleteData( +void wchar_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool wchar_externalPubSubType::getKey( +bool wchar_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2511,35 +2103,27 @@ bool wchar_externalPubSubType::getKey( const wchar_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), wchar_external_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 || wchar_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2553,26 +2137,21 @@ void wchar_externalPubSubType::register_type_object_representation() sequence_short_externalPubSubType::sequence_short_externalPubSubType() { - setName("sequence_short_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sequence_short_external::getMaxCdrSerializedSize()); -#else - sequence_short_external_max_cdr_typesize; -#endif + set_name("sequence_short_external"); + uint32_t type_size = sequence_short_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = sequence_short_external_max_key_cdr_typesize > 16 ? sequence_short_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = sequence_short_external_max_key_cdr_typesize > 16 ? sequence_short_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } sequence_short_externalPubSubType::~sequence_short_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2590,12 +2169,10 @@ bool sequence_short_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2610,11 +2187,7 @@ bool sequence_short_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2631,11 +2204,7 @@ bool sequence_short_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2652,52 +2221,43 @@ bool sequence_short_externalPubSubType::deserialize( return true; } -std::function sequence_short_externalPubSubType::getSerializedSizeProvider( +uint32_t sequence_short_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* sequence_short_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* sequence_short_externalPubSubType::create_data() { return reinterpret_cast(new sequence_short_external()); } -void sequence_short_externalPubSubType::deleteData( +void sequence_short_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool sequence_short_externalPubSubType::getKey( +bool sequence_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2705,35 +2265,27 @@ bool sequence_short_externalPubSubType::getKey( const sequence_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sequence_short_external_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 || sequence_short_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2747,26 +2299,21 @@ void sequence_short_externalPubSubType::register_type_object_representation() string_unbounded_externalPubSubType::string_unbounded_externalPubSubType() { - setName("string_unbounded_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_unbounded_external::getMaxCdrSerializedSize()); -#else - string_unbounded_external_max_cdr_typesize; -#endif + set_name("string_unbounded_external"); + uint32_t type_size = string_unbounded_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_unbounded_external_max_key_cdr_typesize > 16 ? string_unbounded_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_unbounded_external_max_key_cdr_typesize > 16 ? string_unbounded_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_unbounded_externalPubSubType::~string_unbounded_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2784,12 +2331,10 @@ bool string_unbounded_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2804,11 +2349,7 @@ bool string_unbounded_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2825,11 +2366,7 @@ bool string_unbounded_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2846,52 +2383,43 @@ bool string_unbounded_externalPubSubType::deserialize( return true; } -std::function string_unbounded_externalPubSubType::getSerializedSizeProvider( +uint32_t string_unbounded_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* string_unbounded_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* string_unbounded_externalPubSubType::create_data() { return reinterpret_cast(new string_unbounded_external()); } -void string_unbounded_externalPubSubType::deleteData( +void string_unbounded_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_unbounded_externalPubSubType::getKey( +bool string_unbounded_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2899,35 +2427,27 @@ bool string_unbounded_externalPubSubType::getKey( const string_unbounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_unbounded_external_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 || string_unbounded_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2941,26 +2461,21 @@ void string_unbounded_externalPubSubType::register_type_object_representation() string_bounded_externalPubSubType::string_bounded_externalPubSubType() { - setName("string_bounded_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_bounded_external::getMaxCdrSerializedSize()); -#else - string_bounded_external_max_cdr_typesize; -#endif + set_name("string_bounded_external"); + uint32_t type_size = string_bounded_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_bounded_external_max_key_cdr_typesize > 16 ? string_bounded_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_bounded_external_max_key_cdr_typesize > 16 ? string_bounded_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_bounded_externalPubSubType::~string_bounded_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2978,12 +2493,10 @@ bool string_bounded_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2998,11 +2511,7 @@ bool string_bounded_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3019,11 +2528,7 @@ bool string_bounded_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3040,52 +2545,43 @@ bool string_bounded_externalPubSubType::deserialize( return true; } -std::function string_bounded_externalPubSubType::getSerializedSizeProvider( +uint32_t string_bounded_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* string_bounded_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* string_bounded_externalPubSubType::create_data() { return reinterpret_cast(new string_bounded_external()); } -void string_bounded_externalPubSubType::deleteData( +void string_bounded_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_bounded_externalPubSubType::getKey( +bool string_bounded_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3093,35 +2589,27 @@ bool string_bounded_externalPubSubType::getKey( const string_bounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_bounded_external_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 || string_bounded_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3135,26 +2623,21 @@ void string_bounded_externalPubSubType::register_type_object_representation() map_short_externalPubSubType::map_short_externalPubSubType() { - setName("map_short_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(map_short_external::getMaxCdrSerializedSize()); -#else - map_short_external_max_cdr_typesize; -#endif + set_name("map_short_external"); + uint32_t type_size = map_short_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = map_short_external_max_key_cdr_typesize > 16 ? map_short_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = map_short_external_max_key_cdr_typesize > 16 ? map_short_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } map_short_externalPubSubType::~map_short_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3172,12 +2655,10 @@ bool map_short_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3192,11 +2673,7 @@ bool map_short_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3213,11 +2690,7 @@ bool map_short_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3234,52 +2707,43 @@ bool map_short_externalPubSubType::deserialize( return true; } -std::function map_short_externalPubSubType::getSerializedSizeProvider( +uint32_t map_short_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* map_short_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* map_short_externalPubSubType::create_data() { return reinterpret_cast(new map_short_external()); } -void map_short_externalPubSubType::deleteData( +void map_short_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool map_short_externalPubSubType::getKey( +bool map_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3287,35 +2751,27 @@ bool map_short_externalPubSubType::getKey( const map_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), map_short_external_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 || map_short_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3329,26 +2785,21 @@ void map_short_externalPubSubType::register_type_object_representation() array_short_externalPubSubType::array_short_externalPubSubType() { - setName("array_short_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(array_short_external::getMaxCdrSerializedSize()); -#else - array_short_external_max_cdr_typesize; -#endif + set_name("array_short_external"); + uint32_t type_size = array_short_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = array_short_external_max_key_cdr_typesize > 16 ? array_short_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = array_short_external_max_key_cdr_typesize > 16 ? array_short_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } array_short_externalPubSubType::~array_short_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3366,12 +2817,10 @@ bool array_short_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3386,11 +2835,7 @@ bool array_short_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3407,11 +2852,7 @@ bool array_short_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3428,52 +2869,43 @@ bool array_short_externalPubSubType::deserialize( return true; } -std::function array_short_externalPubSubType::getSerializedSizeProvider( +uint32_t array_short_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* array_short_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* array_short_externalPubSubType::create_data() { return reinterpret_cast(new array_short_external()); } -void array_short_externalPubSubType::deleteData( +void array_short_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool array_short_externalPubSubType::getKey( +bool array_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3481,35 +2913,27 @@ bool array_short_externalPubSubType::getKey( const array_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), array_short_external_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 || array_short_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3523,26 +2947,21 @@ void array_short_externalPubSubType::register_type_object_representation() struct_externalPubSubType::struct_externalPubSubType() { - setName("struct_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_external::getMaxCdrSerializedSize()); -#else - struct_external_max_cdr_typesize; -#endif + set_name("struct_external"); + uint32_t type_size = struct_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_external_max_key_cdr_typesize > 16 ? struct_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_external_max_key_cdr_typesize > 16 ? struct_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_externalPubSubType::~struct_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3560,12 +2979,10 @@ bool struct_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3580,11 +2997,7 @@ bool struct_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3601,11 +3014,7 @@ bool struct_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3622,52 +3031,43 @@ bool struct_externalPubSubType::deserialize( return true; } -std::function struct_externalPubSubType::getSerializedSizeProvider( +uint32_t struct_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* struct_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* struct_externalPubSubType::create_data() { return reinterpret_cast(new struct_external()); } -void struct_externalPubSubType::deleteData( +void struct_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_externalPubSubType::getKey( +bool struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3675,35 +3075,27 @@ bool struct_externalPubSubType::getKey( const struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_external_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 || struct_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3717,26 +3109,21 @@ void struct_externalPubSubType::register_type_object_representation() InnerStructExternalPubSubType::InnerStructExternalPubSubType() { - setName("InnerStructExternal"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructExternal::getMaxCdrSerializedSize()); -#else - InnerStructExternal_max_cdr_typesize; -#endif + set_name("InnerStructExternal"); + uint32_t type_size = InnerStructExternal_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructExternal_max_key_cdr_typesize > 16 ? InnerStructExternal_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructExternal_max_key_cdr_typesize > 16 ? InnerStructExternal_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructExternalPubSubType::~InnerStructExternalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3754,12 +3141,10 @@ bool InnerStructExternalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3774,11 +3159,7 @@ bool InnerStructExternalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3795,11 +3176,7 @@ bool InnerStructExternalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3816,52 +3193,43 @@ bool InnerStructExternalPubSubType::deserialize( return true; } -std::function InnerStructExternalPubSubType::getSerializedSizeProvider( +uint32_t InnerStructExternalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerStructExternalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerStructExternalPubSubType::create_data() { return reinterpret_cast(new InnerStructExternal()); } -void InnerStructExternalPubSubType::deleteData( +void InnerStructExternalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructExternalPubSubType::getKey( +bool InnerStructExternalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3869,35 +3237,27 @@ bool InnerStructExternalPubSubType::getKey( const InnerStructExternal* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructExternal_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 || InnerStructExternal_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3911,26 +3271,21 @@ void InnerStructExternalPubSubType::register_type_object_representation() ext_struct_externalPubSubType::ext_struct_externalPubSubType() { - setName("ext_struct_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ext_struct_external::getMaxCdrSerializedSize()); -#else - ext_struct_external_max_cdr_typesize; -#endif + set_name("ext_struct_external"); + uint32_t type_size = ext_struct_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ext_struct_external_max_key_cdr_typesize > 16 ? ext_struct_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ext_struct_external_max_key_cdr_typesize > 16 ? ext_struct_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ext_struct_externalPubSubType::~ext_struct_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3948,12 +3303,10 @@ bool ext_struct_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3968,11 +3321,7 @@ bool ext_struct_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3989,11 +3338,7 @@ bool ext_struct_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4010,52 +3355,43 @@ bool ext_struct_externalPubSubType::deserialize( return true; } -std::function ext_struct_externalPubSubType::getSerializedSizeProvider( +uint32_t ext_struct_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ext_struct_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ext_struct_externalPubSubType::create_data() { return reinterpret_cast(new ext_struct_external()); } -void ext_struct_externalPubSubType::deleteData( +void ext_struct_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ext_struct_externalPubSubType::getKey( +bool ext_struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4063,35 +3399,27 @@ bool ext_struct_externalPubSubType::getKey( const ext_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ext_struct_external_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 || ext_struct_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4105,26 +3433,21 @@ void ext_struct_externalPubSubType::register_type_object_representation() ext_and_inner_struct_externalPubSubType::ext_and_inner_struct_externalPubSubType() { - setName("ext_and_inner_struct_external"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ext_and_inner_struct_external::getMaxCdrSerializedSize()); -#else - ext_and_inner_struct_external_max_cdr_typesize; -#endif + set_name("ext_and_inner_struct_external"); + uint32_t type_size = ext_and_inner_struct_external_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ext_and_inner_struct_external_max_key_cdr_typesize > 16 ? ext_and_inner_struct_external_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ext_and_inner_struct_external_max_key_cdr_typesize > 16 ? ext_and_inner_struct_external_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ext_and_inner_struct_externalPubSubType::~ext_and_inner_struct_externalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4142,12 +3465,10 @@ bool ext_and_inner_struct_externalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4162,11 +3483,7 @@ bool ext_and_inner_struct_externalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4183,11 +3500,7 @@ bool ext_and_inner_struct_externalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4204,52 +3517,43 @@ bool ext_and_inner_struct_externalPubSubType::deserialize( return true; } -std::function ext_and_inner_struct_externalPubSubType::getSerializedSizeProvider( +uint32_t ext_and_inner_struct_externalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ext_and_inner_struct_externalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ext_and_inner_struct_externalPubSubType::create_data() { return reinterpret_cast(new ext_and_inner_struct_external()); } -void ext_and_inner_struct_externalPubSubType::deleteData( +void ext_and_inner_struct_externalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ext_and_inner_struct_externalPubSubType::getKey( +bool ext_and_inner_struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4257,35 +3561,27 @@ bool ext_and_inner_struct_externalPubSubType::getKey( const ext_and_inner_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ext_and_inner_struct_external_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 || ext_and_inner_struct_external_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4299,26 +3595,21 @@ void ext_and_inner_struct_externalPubSubType::register_type_object_representatio struct_external_optionalPubSubType::struct_external_optionalPubSubType() { - setName("struct_external_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_external_optional::getMaxCdrSerializedSize()); -#else - struct_external_optional_max_cdr_typesize; -#endif + set_name("struct_external_optional"); + uint32_t type_size = struct_external_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_external_optional_max_key_cdr_typesize > 16 ? struct_external_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_external_optional_max_key_cdr_typesize > 16 ? struct_external_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_external_optionalPubSubType::~struct_external_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4336,12 +3627,10 @@ bool struct_external_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4356,11 +3645,7 @@ bool struct_external_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4377,11 +3662,7 @@ bool struct_external_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4398,52 +3679,43 @@ bool struct_external_optionalPubSubType::deserialize( return true; } -std::function struct_external_optionalPubSubType::getSerializedSizeProvider( +uint32_t struct_external_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* struct_external_optionalPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* struct_external_optionalPubSubType::create_data() { return reinterpret_cast(new struct_external_optional()); } -void struct_external_optionalPubSubType::deleteData( +void struct_external_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_external_optionalPubSubType::getKey( +bool struct_external_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4451,35 +3723,27 @@ bool struct_external_optionalPubSubType::getKey( const struct_external_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_external_optional_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 || struct_external_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4494,26 +3758,21 @@ void struct_external_optionalPubSubType::register_type_object_representation() recursive_union_containerPubSubType::recursive_union_containerPubSubType() { - setName("recursive_union_container"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(recursive_union_container::getMaxCdrSerializedSize()); -#else - recursive_union_container_max_cdr_typesize; -#endif + set_name("recursive_union_container"); + uint32_t type_size = recursive_union_container_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = recursive_union_container_max_key_cdr_typesize > 16 ? recursive_union_container_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = recursive_union_container_max_key_cdr_typesize > 16 ? recursive_union_container_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } recursive_union_containerPubSubType::~recursive_union_containerPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4531,12 +3790,10 @@ bool recursive_union_containerPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4551,11 +3808,7 @@ bool recursive_union_containerPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4572,11 +3825,7 @@ bool recursive_union_containerPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4593,52 +3842,43 @@ bool recursive_union_containerPubSubType::deserialize( return true; } -std::function recursive_union_containerPubSubType::getSerializedSizeProvider( +uint32_t recursive_union_containerPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* recursive_union_containerPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* recursive_union_containerPubSubType::create_data() { return reinterpret_cast(new recursive_union_container()); } -void recursive_union_containerPubSubType::deleteData( +void recursive_union_containerPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool recursive_union_containerPubSubType::getKey( +bool recursive_union_containerPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4646,35 +3886,27 @@ bool recursive_union_containerPubSubType::getKey( const recursive_union_container* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), recursive_union_container_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 || recursive_union_container_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4689,26 +3921,21 @@ void recursive_union_containerPubSubType::register_type_object_representation() recursive_test_1PubSubType::recursive_test_1PubSubType() { - setName("recursive_test_1"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(recursive_test_1::getMaxCdrSerializedSize()); -#else - recursive_test_1_max_cdr_typesize; -#endif + set_name("recursive_test_1"); + uint32_t type_size = recursive_test_1_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = recursive_test_1_max_key_cdr_typesize > 16 ? recursive_test_1_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = recursive_test_1_max_key_cdr_typesize > 16 ? recursive_test_1_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } recursive_test_1PubSubType::~recursive_test_1PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4726,12 +3953,10 @@ bool recursive_test_1PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4746,11 +3971,7 @@ bool recursive_test_1PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4767,11 +3988,7 @@ bool recursive_test_1PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4788,52 +4005,43 @@ bool recursive_test_1PubSubType::deserialize( return true; } -std::function recursive_test_1PubSubType::getSerializedSizeProvider( +uint32_t recursive_test_1PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* recursive_test_1PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* recursive_test_1PubSubType::create_data() { return reinterpret_cast(new recursive_test_1()); } -void recursive_test_1PubSubType::deleteData( +void recursive_test_1PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool recursive_test_1PubSubType::getKey( +bool recursive_test_1PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4841,35 +4049,27 @@ bool recursive_test_1PubSubType::getKey( const recursive_test_1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), recursive_test_1_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 || recursive_test_1_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4885,26 +4085,21 @@ void recursive_test_1PubSubType::register_type_object_representation() recursive_structurePubSubType::recursive_structurePubSubType() { - setName("recursive_structure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(recursive_structure::getMaxCdrSerializedSize()); -#else - recursive_structure_max_cdr_typesize; -#endif + set_name("recursive_structure"); + uint32_t type_size = recursive_structure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = recursive_structure_max_key_cdr_typesize > 16 ? recursive_structure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = recursive_structure_max_key_cdr_typesize > 16 ? recursive_structure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } recursive_structurePubSubType::~recursive_structurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4922,12 +4117,10 @@ bool recursive_structurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4942,11 +4135,7 @@ bool recursive_structurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4963,11 +4152,7 @@ bool recursive_structurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4984,52 +4169,43 @@ bool recursive_structurePubSubType::deserialize( return true; } -std::function recursive_structurePubSubType::getSerializedSizeProvider( +uint32_t recursive_structurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* recursive_structurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* recursive_structurePubSubType::create_data() { return reinterpret_cast(new recursive_structure()); } -void recursive_structurePubSubType::deleteData( +void recursive_structurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool recursive_structurePubSubType::getKey( +bool recursive_structurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5037,35 +4213,27 @@ bool recursive_structurePubSubType::getKey( const recursive_structure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), recursive_structure_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 || recursive_structure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5079,26 +4247,21 @@ void recursive_structurePubSubType::register_type_object_representation() recursive_test_2PubSubType::recursive_test_2PubSubType() { - setName("recursive_test_2"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(recursive_test_2::getMaxCdrSerializedSize()); -#else - recursive_test_2_max_cdr_typesize; -#endif + set_name("recursive_test_2"); + uint32_t type_size = recursive_test_2_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = recursive_test_2_max_key_cdr_typesize > 16 ? recursive_test_2_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = recursive_test_2_max_key_cdr_typesize > 16 ? recursive_test_2_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } recursive_test_2PubSubType::~recursive_test_2PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5116,12 +4279,10 @@ bool recursive_test_2PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5136,11 +4297,7 @@ bool recursive_test_2PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5157,11 +4314,7 @@ bool recursive_test_2PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5178,52 +4331,43 @@ bool recursive_test_2PubSubType::deserialize( return true; } -std::function recursive_test_2PubSubType::getSerializedSizeProvider( +uint32_t recursive_test_2PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* recursive_test_2PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* recursive_test_2PubSubType::create_data() { return reinterpret_cast(new recursive_test_2()); } -void recursive_test_2PubSubType::deleteData( +void recursive_test_2PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool recursive_test_2PubSubType::getKey( +bool recursive_test_2PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5231,35 +4375,27 @@ bool recursive_test_2PubSubType::getKey( const recursive_test_2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), recursive_test_2_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 || recursive_test_2_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index ed4a2d3f441..66e2f6bccc4 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -62,18 +62,18 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1765,18 +1765,18 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1811,8 +1811,8 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1840,18 +1840,18 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1886,8 +1886,8 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1916,18 +1916,18 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1962,8 +1962,8 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1990,18 +1990,18 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2036,8 +2036,8 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/finalPubSubTypes.cxx b/test/dds-types-test/finalPubSubTypes.cxx index e83b5ae42c3..59b5523ea48 100644 --- a/test/dds-types-test/finalPubSubTypes.cxx +++ b/test/dds-types-test/finalPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FinalShortStructPubSubType::FinalShortStructPubSubType() { - setName("FinalShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalShortStruct::getMaxCdrSerializedSize()); -#else - FinalShortStruct_max_cdr_typesize; -#endif + set_name("FinalShortStruct"); + uint32_t type_size = FinalShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalShortStruct_max_key_cdr_typesize > 16 ? FinalShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalShortStruct_max_key_cdr_typesize > 16 ? FinalShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalShortStructPubSubType::~FinalShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool FinalShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool FinalShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool FinalShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool FinalShortStructPubSubType::deserialize( return true; } -std::function FinalShortStructPubSubType::getSerializedSizeProvider( +uint32_t FinalShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalShortStructPubSubType::create_data() { return reinterpret_cast(new FinalShortStruct()); } -void FinalShortStructPubSubType::deleteData( +void FinalShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalShortStructPubSubType::getKey( +bool FinalShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool FinalShortStructPubSubType::getKey( const FinalShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalShortStruct_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 || FinalShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void FinalShortStructPubSubType::register_type_object_representation() FinalUShortStructPubSubType::FinalUShortStructPubSubType() { - setName("FinalUShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalUShortStruct::getMaxCdrSerializedSize()); -#else - FinalUShortStruct_max_cdr_typesize; -#endif + set_name("FinalUShortStruct"); + uint32_t type_size = FinalUShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalUShortStruct_max_key_cdr_typesize > 16 ? FinalUShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalUShortStruct_max_key_cdr_typesize > 16 ? FinalUShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalUShortStructPubSubType::~FinalUShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool FinalUShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool FinalUShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool FinalUShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool FinalUShortStructPubSubType::deserialize( return true; } -std::function FinalUShortStructPubSubType::getSerializedSizeProvider( +uint32_t FinalUShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalUShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalUShortStructPubSubType::create_data() { return reinterpret_cast(new FinalUShortStruct()); } -void FinalUShortStructPubSubType::deleteData( +void FinalUShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalUShortStructPubSubType::getKey( +bool FinalUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool FinalUShortStructPubSubType::getKey( const FinalUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalUShortStruct_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 || FinalUShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void FinalUShortStructPubSubType::register_type_object_representation() FinalLongStructPubSubType::FinalLongStructPubSubType() { - setName("FinalLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalLongStruct::getMaxCdrSerializedSize()); -#else - FinalLongStruct_max_cdr_typesize; -#endif + set_name("FinalLongStruct"); + uint32_t type_size = FinalLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalLongStruct_max_key_cdr_typesize > 16 ? FinalLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalLongStruct_max_key_cdr_typesize > 16 ? FinalLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalLongStructPubSubType::~FinalLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool FinalLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool FinalLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool FinalLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool FinalLongStructPubSubType::deserialize( return true; } -std::function FinalLongStructPubSubType::getSerializedSizeProvider( +uint32_t FinalLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalLongStructPubSubType::create_data() { return reinterpret_cast(new FinalLongStruct()); } -void FinalLongStructPubSubType::deleteData( +void FinalLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalLongStructPubSubType::getKey( +bool FinalLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool FinalLongStructPubSubType::getKey( const FinalLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalLongStruct_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 || FinalLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void FinalLongStructPubSubType::register_type_object_representation() FinalULongStructPubSubType::FinalULongStructPubSubType() { - setName("FinalULongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalULongStruct::getMaxCdrSerializedSize()); -#else - FinalULongStruct_max_cdr_typesize; -#endif + set_name("FinalULongStruct"); + uint32_t type_size = FinalULongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalULongStruct_max_key_cdr_typesize > 16 ? FinalULongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalULongStruct_max_key_cdr_typesize > 16 ? FinalULongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalULongStructPubSubType::~FinalULongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool FinalULongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool FinalULongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool FinalULongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool FinalULongStructPubSubType::deserialize( return true; } -std::function FinalULongStructPubSubType::getSerializedSizeProvider( +uint32_t FinalULongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalULongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalULongStructPubSubType::create_data() { return reinterpret_cast(new FinalULongStruct()); } -void FinalULongStructPubSubType::deleteData( +void FinalULongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalULongStructPubSubType::getKey( +bool FinalULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool FinalULongStructPubSubType::getKey( const FinalULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalULongStruct_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 || FinalULongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void FinalULongStructPubSubType::register_type_object_representation() FinalLongLongStructPubSubType::FinalLongLongStructPubSubType() { - setName("FinalLongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalLongLongStruct::getMaxCdrSerializedSize()); -#else - FinalLongLongStruct_max_cdr_typesize; -#endif + set_name("FinalLongLongStruct"); + uint32_t type_size = FinalLongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalLongLongStruct_max_key_cdr_typesize > 16 ? FinalLongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalLongLongStruct_max_key_cdr_typesize > 16 ? FinalLongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalLongLongStructPubSubType::~FinalLongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool FinalLongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool FinalLongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool FinalLongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool FinalLongLongStructPubSubType::deserialize( return true; } -std::function FinalLongLongStructPubSubType::getSerializedSizeProvider( +uint32_t FinalLongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalLongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalLongLongStructPubSubType::create_data() { return reinterpret_cast(new FinalLongLongStruct()); } -void FinalLongLongStructPubSubType::deleteData( +void FinalLongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalLongLongStructPubSubType::getKey( +bool FinalLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool FinalLongLongStructPubSubType::getKey( const FinalLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalLongLongStruct_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 || FinalLongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void FinalLongLongStructPubSubType::register_type_object_representation() FinalULongLongStructPubSubType::FinalULongLongStructPubSubType() { - setName("FinalULongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalULongLongStruct::getMaxCdrSerializedSize()); -#else - FinalULongLongStruct_max_cdr_typesize; -#endif + set_name("FinalULongLongStruct"); + uint32_t type_size = FinalULongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalULongLongStruct_max_key_cdr_typesize > 16 ? FinalULongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalULongLongStruct_max_key_cdr_typesize > 16 ? FinalULongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalULongLongStructPubSubType::~FinalULongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool FinalULongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool FinalULongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool FinalULongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool FinalULongLongStructPubSubType::deserialize( return true; } -std::function FinalULongLongStructPubSubType::getSerializedSizeProvider( +uint32_t FinalULongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalULongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalULongLongStructPubSubType::create_data() { return reinterpret_cast(new FinalULongLongStruct()); } -void FinalULongLongStructPubSubType::deleteData( +void FinalULongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalULongLongStructPubSubType::getKey( +bool FinalULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool FinalULongLongStructPubSubType::getKey( const FinalULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalULongLongStruct_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 || FinalULongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void FinalULongLongStructPubSubType::register_type_object_representation() FinalFloatStructPubSubType::FinalFloatStructPubSubType() { - setName("FinalFloatStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalFloatStruct::getMaxCdrSerializedSize()); -#else - FinalFloatStruct_max_cdr_typesize; -#endif + set_name("FinalFloatStruct"); + uint32_t type_size = FinalFloatStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalFloatStruct_max_key_cdr_typesize > 16 ? FinalFloatStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalFloatStruct_max_key_cdr_typesize > 16 ? FinalFloatStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalFloatStructPubSubType::~FinalFloatStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool FinalFloatStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool FinalFloatStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool FinalFloatStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool FinalFloatStructPubSubType::deserialize( return true; } -std::function FinalFloatStructPubSubType::getSerializedSizeProvider( +uint32_t FinalFloatStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalFloatStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalFloatStructPubSubType::create_data() { return reinterpret_cast(new FinalFloatStruct()); } -void FinalFloatStructPubSubType::deleteData( +void FinalFloatStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalFloatStructPubSubType::getKey( +bool FinalFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool FinalFloatStructPubSubType::getKey( const FinalFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalFloatStruct_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 || FinalFloatStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void FinalFloatStructPubSubType::register_type_object_representation() FinalDoubleStructPubSubType::FinalDoubleStructPubSubType() { - setName("FinalDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalDoubleStruct::getMaxCdrSerializedSize()); -#else - FinalDoubleStruct_max_cdr_typesize; -#endif + set_name("FinalDoubleStruct"); + uint32_t type_size = FinalDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalDoubleStruct_max_key_cdr_typesize > 16 ? FinalDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalDoubleStruct_max_key_cdr_typesize > 16 ? FinalDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalDoubleStructPubSubType::~FinalDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool FinalDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool FinalDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool FinalDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool FinalDoubleStructPubSubType::deserialize( return true; } -std::function FinalDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t FinalDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalDoubleStructPubSubType::create_data() { return reinterpret_cast(new FinalDoubleStruct()); } -void FinalDoubleStructPubSubType::deleteData( +void FinalDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalDoubleStructPubSubType::getKey( +bool FinalDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool FinalDoubleStructPubSubType::getKey( const FinalDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalDoubleStruct_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 || FinalDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void FinalDoubleStructPubSubType::register_type_object_representation() FinalLongDoubleStructPubSubType::FinalLongDoubleStructPubSubType() { - setName("FinalLongDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalLongDoubleStruct::getMaxCdrSerializedSize()); -#else - FinalLongDoubleStruct_max_cdr_typesize; -#endif + set_name("FinalLongDoubleStruct"); + uint32_t type_size = FinalLongDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalLongDoubleStruct_max_key_cdr_typesize > 16 ? FinalLongDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalLongDoubleStruct_max_key_cdr_typesize > 16 ? FinalLongDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalLongDoubleStructPubSubType::~FinalLongDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool FinalLongDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool FinalLongDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool FinalLongDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool FinalLongDoubleStructPubSubType::deserialize( return true; } -std::function FinalLongDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t FinalLongDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalLongDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalLongDoubleStructPubSubType::create_data() { return reinterpret_cast(new FinalLongDoubleStruct()); } -void FinalLongDoubleStructPubSubType::deleteData( +void FinalLongDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalLongDoubleStructPubSubType::getKey( +bool FinalLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool FinalLongDoubleStructPubSubType::getKey( const FinalLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalLongDoubleStruct_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 || FinalLongDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void FinalLongDoubleStructPubSubType::register_type_object_representation() FinalBooleanStructPubSubType::FinalBooleanStructPubSubType() { - setName("FinalBooleanStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalBooleanStruct::getMaxCdrSerializedSize()); -#else - FinalBooleanStruct_max_cdr_typesize; -#endif + set_name("FinalBooleanStruct"); + uint32_t type_size = FinalBooleanStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalBooleanStruct_max_key_cdr_typesize > 16 ? FinalBooleanStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalBooleanStruct_max_key_cdr_typesize > 16 ? FinalBooleanStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalBooleanStructPubSubType::~FinalBooleanStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool FinalBooleanStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool FinalBooleanStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool FinalBooleanStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool FinalBooleanStructPubSubType::deserialize( return true; } -std::function FinalBooleanStructPubSubType::getSerializedSizeProvider( +uint32_t FinalBooleanStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalBooleanStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalBooleanStructPubSubType::create_data() { return reinterpret_cast(new FinalBooleanStruct()); } -void FinalBooleanStructPubSubType::deleteData( +void FinalBooleanStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalBooleanStructPubSubType::getKey( +bool FinalBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool FinalBooleanStructPubSubType::getKey( const FinalBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalBooleanStruct_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 || FinalBooleanStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void FinalBooleanStructPubSubType::register_type_object_representation() FinalOctetStructPubSubType::FinalOctetStructPubSubType() { - setName("FinalOctetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalOctetStruct::getMaxCdrSerializedSize()); -#else - FinalOctetStruct_max_cdr_typesize; -#endif + set_name("FinalOctetStruct"); + uint32_t type_size = FinalOctetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalOctetStruct_max_key_cdr_typesize > 16 ? FinalOctetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalOctetStruct_max_key_cdr_typesize > 16 ? FinalOctetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalOctetStructPubSubType::~FinalOctetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool FinalOctetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool FinalOctetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool FinalOctetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool FinalOctetStructPubSubType::deserialize( return true; } -std::function FinalOctetStructPubSubType::getSerializedSizeProvider( +uint32_t FinalOctetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalOctetStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalOctetStructPubSubType::create_data() { return reinterpret_cast(new FinalOctetStruct()); } -void FinalOctetStructPubSubType::deleteData( +void FinalOctetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalOctetStructPubSubType::getKey( +bool FinalOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool FinalOctetStructPubSubType::getKey( const FinalOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalOctetStruct_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 || FinalOctetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void FinalOctetStructPubSubType::register_type_object_representation() FinalCharStructPubSubType::FinalCharStructPubSubType() { - setName("FinalCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalCharStruct::getMaxCdrSerializedSize()); -#else - FinalCharStruct_max_cdr_typesize; -#endif + set_name("FinalCharStruct"); + uint32_t type_size = FinalCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalCharStruct_max_key_cdr_typesize > 16 ? FinalCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalCharStruct_max_key_cdr_typesize > 16 ? FinalCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalCharStructPubSubType::~FinalCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool FinalCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool FinalCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool FinalCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool FinalCharStructPubSubType::deserialize( return true; } -std::function FinalCharStructPubSubType::getSerializedSizeProvider( +uint32_t FinalCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalCharStructPubSubType::create_data() { return reinterpret_cast(new FinalCharStruct()); } -void FinalCharStructPubSubType::deleteData( +void FinalCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalCharStructPubSubType::getKey( +bool FinalCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool FinalCharStructPubSubType::getKey( const FinalCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalCharStruct_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 || FinalCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void FinalCharStructPubSubType::register_type_object_representation() FinalWCharStructPubSubType::FinalWCharStructPubSubType() { - setName("FinalWCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalWCharStruct::getMaxCdrSerializedSize()); -#else - FinalWCharStruct_max_cdr_typesize; -#endif + set_name("FinalWCharStruct"); + uint32_t type_size = FinalWCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalWCharStruct_max_key_cdr_typesize > 16 ? FinalWCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalWCharStruct_max_key_cdr_typesize > 16 ? FinalWCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalWCharStructPubSubType::~FinalWCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool FinalWCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool FinalWCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool FinalWCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool FinalWCharStructPubSubType::deserialize( return true; } -std::function FinalWCharStructPubSubType::getSerializedSizeProvider( +uint32_t FinalWCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalWCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalWCharStructPubSubType::create_data() { return reinterpret_cast(new FinalWCharStruct()); } -void FinalWCharStructPubSubType::deleteData( +void FinalWCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalWCharStructPubSubType::getKey( +bool FinalWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool FinalWCharStructPubSubType::getKey( const FinalWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalWCharStruct_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 || FinalWCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void FinalWCharStructPubSubType::register_type_object_representation() FinalUnionStructPubSubType::FinalUnionStructPubSubType() { - setName("FinalUnionStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalUnionStruct::getMaxCdrSerializedSize()); -#else - FinalUnionStruct_max_cdr_typesize; -#endif + set_name("FinalUnionStruct"); + uint32_t type_size = FinalUnionStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalUnionStruct_max_key_cdr_typesize > 16 ? FinalUnionStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalUnionStruct_max_key_cdr_typesize > 16 ? FinalUnionStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalUnionStructPubSubType::~FinalUnionStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool FinalUnionStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool FinalUnionStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool FinalUnionStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool FinalUnionStructPubSubType::deserialize( return true; } -std::function FinalUnionStructPubSubType::getSerializedSizeProvider( +uint32_t FinalUnionStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalUnionStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalUnionStructPubSubType::create_data() { return reinterpret_cast(new FinalUnionStruct()); } -void FinalUnionStructPubSubType::deleteData( +void FinalUnionStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalUnionStructPubSubType::getKey( +bool FinalUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool FinalUnionStructPubSubType::getKey( const FinalUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalUnionStruct_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 || FinalUnionStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void FinalUnionStructPubSubType::register_type_object_representation() FinalEmptyStructPubSubType::FinalEmptyStructPubSubType() { - setName("FinalEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalEmptyStruct::getMaxCdrSerializedSize()); -#else - FinalEmptyStruct_max_cdr_typesize; -#endif + set_name("FinalEmptyStruct"); + uint32_t type_size = FinalEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalEmptyStruct_max_key_cdr_typesize > 16 ? FinalEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalEmptyStruct_max_key_cdr_typesize > 16 ? FinalEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalEmptyStructPubSubType::~FinalEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool FinalEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool FinalEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool FinalEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool FinalEmptyStructPubSubType::deserialize( return true; } -std::function FinalEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t FinalEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalEmptyStructPubSubType::create_data() { return reinterpret_cast(new FinalEmptyStruct()); } -void FinalEmptyStructPubSubType::deleteData( +void FinalEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalEmptyStructPubSubType::getKey( +bool FinalEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool FinalEmptyStructPubSubType::getKey( const FinalEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalEmptyStruct_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 || FinalEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void FinalEmptyStructPubSubType::register_type_object_representation() FinalEmptyInheritanceStructPubSubType::FinalEmptyInheritanceStructPubSubType() { - setName("FinalEmptyInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalEmptyInheritanceStruct::getMaxCdrSerializedSize()); -#else - FinalEmptyInheritanceStruct_max_cdr_typesize; -#endif + set_name("FinalEmptyInheritanceStruct"); + uint32_t type_size = FinalEmptyInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? FinalEmptyInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? FinalEmptyInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalEmptyInheritanceStructPubSubType::~FinalEmptyInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool FinalEmptyInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool FinalEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool FinalEmptyInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool FinalEmptyInheritanceStructPubSubType::deserialize( return true; } -std::function FinalEmptyInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t FinalEmptyInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalEmptyInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalEmptyInheritanceStructPubSubType::create_data() { return reinterpret_cast(new FinalEmptyInheritanceStruct()); } -void FinalEmptyInheritanceStructPubSubType::deleteData( +void FinalEmptyInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalEmptyInheritanceStructPubSubType::getKey( +bool FinalEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool FinalEmptyInheritanceStructPubSubType::getKey( const FinalEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalEmptyInheritanceStruct_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 || FinalEmptyInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void FinalEmptyInheritanceStructPubSubType::register_type_object_representation( FinalInheritanceStructPubSubType::FinalInheritanceStructPubSubType() { - setName("FinalInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalInheritanceStruct::getMaxCdrSerializedSize()); -#else - FinalInheritanceStruct_max_cdr_typesize; -#endif + set_name("FinalInheritanceStruct"); + uint32_t type_size = FinalInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalInheritanceStruct_max_key_cdr_typesize > 16 ? FinalInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalInheritanceStruct_max_key_cdr_typesize > 16 ? FinalInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalInheritanceStructPubSubType::~FinalInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool FinalInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool FinalInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool FinalInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool FinalInheritanceStructPubSubType::deserialize( return true; } -std::function FinalInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t FinalInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalInheritanceStructPubSubType::create_data() { return reinterpret_cast(new FinalInheritanceStruct()); } -void FinalInheritanceStructPubSubType::deleteData( +void FinalInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalInheritanceStructPubSubType::getKey( +bool FinalInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool FinalInheritanceStructPubSubType::getKey( const FinalInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalInheritanceStruct_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 || FinalInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void FinalInheritanceStructPubSubType::register_type_object_representation() InheritanceEmptyStructPubSubType::InheritanceEmptyStructPubSubType() { - setName("InheritanceEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InheritanceEmptyStruct::getMaxCdrSerializedSize()); -#else - InheritanceEmptyStruct_max_cdr_typesize; -#endif + set_name("InheritanceEmptyStruct"); + uint32_t type_size = InheritanceEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InheritanceEmptyStruct_max_key_cdr_typesize > 16 ? InheritanceEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InheritanceEmptyStruct_max_key_cdr_typesize > 16 ? InheritanceEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InheritanceEmptyStructPubSubType::~InheritanceEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool InheritanceEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool InheritanceEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool InheritanceEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool InheritanceEmptyStructPubSubType::deserialize( return true; } -std::function InheritanceEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t InheritanceEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InheritanceEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InheritanceEmptyStructPubSubType::create_data() { return reinterpret_cast(new InheritanceEmptyStruct()); } -void InheritanceEmptyStructPubSubType::deleteData( +void InheritanceEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InheritanceEmptyStructPubSubType::getKey( +bool InheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool InheritanceEmptyStructPubSubType::getKey( const InheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InheritanceEmptyStruct_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 || InheritanceEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void InheritanceEmptyStructPubSubType::register_type_object_representation() FinalExtensibilityInheritancePubSubType::FinalExtensibilityInheritancePubSubType() { - setName("FinalExtensibilityInheritance"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalExtensibilityInheritance::getMaxCdrSerializedSize()); -#else - FinalExtensibilityInheritance_max_cdr_typesize; -#endif + set_name("FinalExtensibilityInheritance"); + uint32_t type_size = FinalExtensibilityInheritance_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalExtensibilityInheritance_max_key_cdr_typesize > 16 ? FinalExtensibilityInheritance_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalExtensibilityInheritance_max_key_cdr_typesize > 16 ? FinalExtensibilityInheritance_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalExtensibilityInheritancePubSubType::~FinalExtensibilityInheritancePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool FinalExtensibilityInheritancePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool FinalExtensibilityInheritancePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool FinalExtensibilityInheritancePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool FinalExtensibilityInheritancePubSubType::deserialize( return true; } -std::function FinalExtensibilityInheritancePubSubType::getSerializedSizeProvider( +uint32_t FinalExtensibilityInheritancePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalExtensibilityInheritancePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalExtensibilityInheritancePubSubType::create_data() { return reinterpret_cast(new FinalExtensibilityInheritance()); } -void FinalExtensibilityInheritancePubSubType::deleteData( +void FinalExtensibilityInheritancePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalExtensibilityInheritancePubSubType::getKey( +bool FinalExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool FinalExtensibilityInheritancePubSubType::getKey( const FinalExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalExtensibilityInheritance_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 || FinalExtensibilityInheritance_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index 90e13b29eec..184eece5fa1 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -95,18 +95,18 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -147,8 +147,8 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -224,18 +224,18 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -276,8 +276,8 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -353,18 +353,18 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -405,8 +405,8 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -482,18 +482,18 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -534,8 +534,8 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -611,18 +611,18 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -663,8 +663,8 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -740,18 +740,18 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -792,8 +792,8 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -869,18 +869,18 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -921,8 +921,8 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -998,18 +998,18 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1050,8 +1050,8 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1127,18 +1127,18 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1179,8 +1179,8 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1256,18 +1256,18 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1308,8 +1308,8 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1385,18 +1385,18 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1437,8 +1437,8 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1514,18 +1514,18 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1566,8 +1566,8 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1643,18 +1643,18 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1695,8 +1695,8 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1739,18 +1739,18 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1785,8 +1785,8 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1813,18 +1813,18 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1865,8 +1865,8 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -1905,18 +1905,18 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1951,8 +1951,8 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1979,18 +1979,18 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2025,8 +2025,8 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2053,18 +2053,18 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2105,8 +2105,8 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -2182,18 +2182,18 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2234,8 +2234,8 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx index cea43fb311e..55ee9bf3e16 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; InnerStructureHelperPubSubType::InnerStructureHelperPubSubType() { - setName("InnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructureHelper::getMaxCdrSerializedSize()); -#else - InnerStructureHelper_max_cdr_typesize; -#endif + set_name("InnerStructureHelper"); + uint32_t type_size = InnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructureHelper_max_key_cdr_typesize > 16 ? InnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructureHelper_max_key_cdr_typesize > 16 ? InnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructureHelperPubSubType::~InnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool InnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool InnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool InnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool InnerStructureHelperPubSubType::deserialize( return true; } -std::function InnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t InnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* InnerStructureHelperPubSubType::createData() +void* InnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new InnerStructureHelper()); } -void InnerStructureHelperPubSubType::deleteData( +void InnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructureHelperPubSubType::getKey( +bool InnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool InnerStructureHelperPubSubType::getKey( const InnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructureHelper_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 || InnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void InnerStructureHelperPubSubType::register_type_object_representation() InnerEmptyStructureHelperPubSubType::InnerEmptyStructureHelperPubSubType() { - setName("InnerEmptyStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerEmptyStructureHelper::getMaxCdrSerializedSize()); -#else - InnerEmptyStructureHelper_max_cdr_typesize; -#endif + set_name("InnerEmptyStructureHelper"); + uint32_t type_size = InnerEmptyStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerEmptyStructureHelper_max_key_cdr_typesize > 16 ? InnerEmptyStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerEmptyStructureHelper_max_key_cdr_typesize > 16 ? InnerEmptyStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerEmptyStructureHelperPubSubType::~InnerEmptyStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool InnerEmptyStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool InnerEmptyStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool InnerEmptyStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool InnerEmptyStructureHelperPubSubType::deserialize( return true; } -std::function InnerEmptyStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t InnerEmptyStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* InnerEmptyStructureHelperPubSubType::createData() +void* InnerEmptyStructureHelperPubSubType::create_data() { return reinterpret_cast(new InnerEmptyStructureHelper()); } -void InnerEmptyStructureHelperPubSubType::deleteData( +void InnerEmptyStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerEmptyStructureHelperPubSubType::getKey( +bool InnerEmptyStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool InnerEmptyStructureHelperPubSubType::getKey( const InnerEmptyStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerEmptyStructureHelper_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 || InnerEmptyStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index 035a8cb07a8..7898a291570 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -62,18 +62,18 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/inheritancePubSubTypes.cxx b/test/dds-types-test/inheritancePubSubTypes.cxx index aea4de131a7..936b7b9ac19 100644 --- a/test/dds-types-test/inheritancePubSubTypes.cxx +++ b/test/dds-types-test/inheritancePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; InnerStructureHelperChildPubSubType::InnerStructureHelperChildPubSubType() { - setName("InnerStructureHelperChild"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructureHelperChild::getMaxCdrSerializedSize()); -#else - InnerStructureHelperChild_max_cdr_typesize; -#endif + set_name("InnerStructureHelperChild"); + uint32_t type_size = InnerStructureHelperChild_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructureHelperChild_max_key_cdr_typesize > 16 ? InnerStructureHelperChild_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructureHelperChild_max_key_cdr_typesize > 16 ? InnerStructureHelperChild_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructureHelperChildPubSubType::~InnerStructureHelperChildPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool InnerStructureHelperChildPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool InnerStructureHelperChildPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool InnerStructureHelperChildPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool InnerStructureHelperChildPubSubType::deserialize( return true; } -std::function InnerStructureHelperChildPubSubType::getSerializedSizeProvider( +uint32_t InnerStructureHelperChildPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerStructureHelperChildPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerStructureHelperChildPubSubType::create_data() { return reinterpret_cast(new InnerStructureHelperChild()); } -void InnerStructureHelperChildPubSubType::deleteData( +void InnerStructureHelperChildPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructureHelperChildPubSubType::getKey( +bool InnerStructureHelperChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool InnerStructureHelperChildPubSubType::getKey( const InnerStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructureHelperChild_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 || InnerStructureHelperChild_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void InnerStructureHelperChildPubSubType::register_type_object_representation() InnerStructureHelperChildChildPubSubType::InnerStructureHelperChildChildPubSubType() { - setName("InnerStructureHelperChildChild"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructureHelperChildChild::getMaxCdrSerializedSize()); -#else - InnerStructureHelperChildChild_max_cdr_typesize; -#endif + set_name("InnerStructureHelperChildChild"); + uint32_t type_size = InnerStructureHelperChildChild_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructureHelperChildChild_max_key_cdr_typesize > 16 ? InnerStructureHelperChildChild_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructureHelperChildChild_max_key_cdr_typesize > 16 ? InnerStructureHelperChildChild_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructureHelperChildChildPubSubType::~InnerStructureHelperChildChildPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool InnerStructureHelperChildChildPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool InnerStructureHelperChildChildPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool InnerStructureHelperChildChildPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool InnerStructureHelperChildChildPubSubType::deserialize( return true; } -std::function InnerStructureHelperChildChildPubSubType::getSerializedSizeProvider( +uint32_t InnerStructureHelperChildChildPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerStructureHelperChildChildPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerStructureHelperChildChildPubSubType::create_data() { return reinterpret_cast(new InnerStructureHelperChildChild()); } -void InnerStructureHelperChildChildPubSubType::deleteData( +void InnerStructureHelperChildChildPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructureHelperChildChildPubSubType::getKey( +bool InnerStructureHelperChildChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool InnerStructureHelperChildChildPubSubType::getKey( const InnerStructureHelperChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructureHelperChildChild_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 || InnerStructureHelperChildChild_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void InnerStructureHelperChildChildPubSubType::register_type_object_representati InnerStructureHelperEmptyChildPubSubType::InnerStructureHelperEmptyChildPubSubType() { - setName("InnerStructureHelperEmptyChild"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructureHelperEmptyChild::getMaxCdrSerializedSize()); -#else - InnerStructureHelperEmptyChild_max_cdr_typesize; -#endif + set_name("InnerStructureHelperEmptyChild"); + uint32_t type_size = InnerStructureHelperEmptyChild_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructureHelperEmptyChild_max_key_cdr_typesize > 16 ? InnerStructureHelperEmptyChild_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructureHelperEmptyChild_max_key_cdr_typesize > 16 ? InnerStructureHelperEmptyChild_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructureHelperEmptyChildPubSubType::~InnerStructureHelperEmptyChildPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool InnerStructureHelperEmptyChildPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool InnerStructureHelperEmptyChildPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool InnerStructureHelperEmptyChildPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool InnerStructureHelperEmptyChildPubSubType::deserialize( return true; } -std::function InnerStructureHelperEmptyChildPubSubType::getSerializedSizeProvider( +uint32_t InnerStructureHelperEmptyChildPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerStructureHelperEmptyChildPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerStructureHelperEmptyChildPubSubType::create_data() { return reinterpret_cast(new InnerStructureHelperEmptyChild()); } -void InnerStructureHelperEmptyChildPubSubType::deleteData( +void InnerStructureHelperEmptyChildPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructureHelperEmptyChildPubSubType::getKey( +bool InnerStructureHelperEmptyChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool InnerStructureHelperEmptyChildPubSubType::getKey( const InnerStructureHelperEmptyChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructureHelperEmptyChild_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 || InnerStructureHelperEmptyChild_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void InnerStructureHelperEmptyChildPubSubType::register_type_object_representati InnerStructureHelperEmptyChildChildPubSubType::InnerStructureHelperEmptyChildChildPubSubType() { - setName("InnerStructureHelperEmptyChildChild"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructureHelperEmptyChildChild::getMaxCdrSerializedSize()); -#else - InnerStructureHelperEmptyChildChild_max_cdr_typesize; -#endif + set_name("InnerStructureHelperEmptyChildChild"); + uint32_t type_size = InnerStructureHelperEmptyChildChild_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructureHelperEmptyChildChild_max_key_cdr_typesize > 16 ? InnerStructureHelperEmptyChildChild_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructureHelperEmptyChildChild_max_key_cdr_typesize > 16 ? InnerStructureHelperEmptyChildChild_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructureHelperEmptyChildChildPubSubType::~InnerStructureHelperEmptyChildChildPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool InnerStructureHelperEmptyChildChildPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool InnerStructureHelperEmptyChildChildPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool InnerStructureHelperEmptyChildChildPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool InnerStructureHelperEmptyChildChildPubSubType::deserialize( return true; } -std::function InnerStructureHelperEmptyChildChildPubSubType::getSerializedSizeProvider( +uint32_t InnerStructureHelperEmptyChildChildPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerStructureHelperEmptyChildChildPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerStructureHelperEmptyChildChildPubSubType::create_data() { return reinterpret_cast(new InnerStructureHelperEmptyChildChild()); } -void InnerStructureHelperEmptyChildChildPubSubType::deleteData( +void InnerStructureHelperEmptyChildChildPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructureHelperEmptyChildChildPubSubType::getKey( +bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool InnerStructureHelperEmptyChildChildPubSubType::getKey( const InnerStructureHelperEmptyChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructureHelperEmptyChildChild_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 || InnerStructureHelperEmptyChildChild_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void InnerStructureHelperEmptyChildChildPubSubType::register_type_object_represe InnerEmptyStructureHelperChildPubSubType::InnerEmptyStructureHelperChildPubSubType() { - setName("InnerEmptyStructureHelperChild"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerEmptyStructureHelperChild::getMaxCdrSerializedSize()); -#else - InnerEmptyStructureHelperChild_max_cdr_typesize; -#endif + set_name("InnerEmptyStructureHelperChild"); + uint32_t type_size = InnerEmptyStructureHelperChild_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerEmptyStructureHelperChild_max_key_cdr_typesize > 16 ? InnerEmptyStructureHelperChild_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerEmptyStructureHelperChild_max_key_cdr_typesize > 16 ? InnerEmptyStructureHelperChild_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerEmptyStructureHelperChildPubSubType::~InnerEmptyStructureHelperChildPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool InnerEmptyStructureHelperChildPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool InnerEmptyStructureHelperChildPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool InnerEmptyStructureHelperChildPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool InnerEmptyStructureHelperChildPubSubType::deserialize( return true; } -std::function InnerEmptyStructureHelperChildPubSubType::getSerializedSizeProvider( +uint32_t InnerEmptyStructureHelperChildPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InnerEmptyStructureHelperChildPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InnerEmptyStructureHelperChildPubSubType::create_data() { return reinterpret_cast(new InnerEmptyStructureHelperChild()); } -void InnerEmptyStructureHelperChildPubSubType::deleteData( +void InnerEmptyStructureHelperChildPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerEmptyStructureHelperChildPubSubType::getKey( +bool InnerEmptyStructureHelperChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool InnerEmptyStructureHelperChildPubSubType::getKey( const InnerEmptyStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerEmptyStructureHelperChild_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 || InnerEmptyStructureHelperChild_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void InnerEmptyStructureHelperChildPubSubType::register_type_object_representati StructAliasInheritanceStructPubSubType::StructAliasInheritanceStructPubSubType() { - setName("StructAliasInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructAliasInheritanceStruct::getMaxCdrSerializedSize()); -#else - StructAliasInheritanceStruct_max_cdr_typesize; -#endif + set_name("StructAliasInheritanceStruct"); + uint32_t type_size = StructAliasInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructAliasInheritanceStruct_max_key_cdr_typesize > 16 ? StructAliasInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructAliasInheritanceStruct_max_key_cdr_typesize > 16 ? StructAliasInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructAliasInheritanceStructPubSubType::~StructAliasInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool StructAliasInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool StructAliasInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool StructAliasInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool StructAliasInheritanceStructPubSubType::deserialize( return true; } -std::function StructAliasInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t StructAliasInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructAliasInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructAliasInheritanceStructPubSubType::create_data() { return reinterpret_cast(new StructAliasInheritanceStruct()); } -void StructAliasInheritanceStructPubSubType::deleteData( +void StructAliasInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructAliasInheritanceStructPubSubType::getKey( +bool StructAliasInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool StructAliasInheritanceStructPubSubType::getKey( const StructAliasInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructAliasInheritanceStruct_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 || StructAliasInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void StructAliasInheritanceStructPubSubType::register_type_object_representation StructuresInheritanceStructPubSubType::StructuresInheritanceStructPubSubType() { - setName("StructuresInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructuresInheritanceStruct::getMaxCdrSerializedSize()); -#else - StructuresInheritanceStruct_max_cdr_typesize; -#endif + set_name("StructuresInheritanceStruct"); + uint32_t type_size = StructuresInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructuresInheritanceStruct_max_key_cdr_typesize > 16 ? StructuresInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructuresInheritanceStruct_max_key_cdr_typesize > 16 ? StructuresInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructuresInheritanceStructPubSubType::~StructuresInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool StructuresInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool StructuresInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool StructuresInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool StructuresInheritanceStructPubSubType::deserialize( return true; } -std::function StructuresInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t StructuresInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructuresInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructuresInheritanceStructPubSubType::create_data() { return reinterpret_cast(new StructuresInheritanceStruct()); } -void StructuresInheritanceStructPubSubType::deleteData( +void StructuresInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructuresInheritanceStructPubSubType::getKey( +bool StructuresInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool StructuresInheritanceStructPubSubType::getKey( const StructuresInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructuresInheritanceStruct_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 || StructuresInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1387,26 +1163,21 @@ void StructuresInheritanceStructPubSubType::register_type_object_representation( BitsetsChildInheritanceStructPubSubType::BitsetsChildInheritanceStructPubSubType() { - setName("BitsetsChildInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BitsetsChildInheritanceStruct::getMaxCdrSerializedSize()); -#else - BitsetsChildInheritanceStruct_max_cdr_typesize; -#endif + set_name("BitsetsChildInheritanceStruct"); + uint32_t type_size = BitsetsChildInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BitsetsChildInheritanceStruct_max_key_cdr_typesize > 16 ? BitsetsChildInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BitsetsChildInheritanceStruct_max_key_cdr_typesize > 16 ? BitsetsChildInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BitsetsChildInheritanceStructPubSubType::~BitsetsChildInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1424,12 +1195,10 @@ bool BitsetsChildInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1444,11 +1213,7 @@ bool BitsetsChildInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1465,11 +1230,7 @@ bool BitsetsChildInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1486,52 +1247,43 @@ bool BitsetsChildInheritanceStructPubSubType::deserialize( return true; } -std::function BitsetsChildInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t BitsetsChildInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BitsetsChildInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BitsetsChildInheritanceStructPubSubType::create_data() { return reinterpret_cast(new BitsetsChildInheritanceStruct()); } -void BitsetsChildInheritanceStructPubSubType::deleteData( +void BitsetsChildInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BitsetsChildInheritanceStructPubSubType::getKey( +bool BitsetsChildInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1539,35 +1291,27 @@ bool BitsetsChildInheritanceStructPubSubType::getKey( const BitsetsChildInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BitsetsChildInheritanceStruct_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 || BitsetsChildInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index fc4d2d7b819..9628d1f66a4 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -62,18 +62,18 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -583,18 +583,18 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -629,8 +629,8 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/keyPubSubTypes.cxx b/test/dds-types-test/keyPubSubTypes.cxx index a625d907e39..99af94e8228 100644 --- a/test/dds-types-test/keyPubSubTypes.cxx +++ b/test/dds-types-test/keyPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedShortStructPubSubType::KeyedShortStructPubSubType() { - setName("KeyedShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedShortStruct::getMaxCdrSerializedSize()); -#else - KeyedShortStruct_max_cdr_typesize; -#endif + set_name("KeyedShortStruct"); + uint32_t type_size = KeyedShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedShortStruct_max_key_cdr_typesize > 16 ? KeyedShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedShortStruct_max_key_cdr_typesize > 16 ? KeyedShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedShortStructPubSubType::~KeyedShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool KeyedShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool KeyedShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool KeyedShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool KeyedShortStructPubSubType::deserialize( return true; } -std::function KeyedShortStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedShortStructPubSubType::create_data() { return reinterpret_cast(new KeyedShortStruct()); } -void KeyedShortStructPubSubType::deleteData( +void KeyedShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedShortStructPubSubType::getKey( +bool KeyedShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool KeyedShortStructPubSubType::getKey( const KeyedShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedShortStruct_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 || KeyedShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void KeyedShortStructPubSubType::register_type_object_representation() KeyedUShortStructPubSubType::KeyedUShortStructPubSubType() { - setName("KeyedUShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedUShortStruct::getMaxCdrSerializedSize()); -#else - KeyedUShortStruct_max_cdr_typesize; -#endif + set_name("KeyedUShortStruct"); + uint32_t type_size = KeyedUShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedUShortStruct_max_key_cdr_typesize > 16 ? KeyedUShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedUShortStruct_max_key_cdr_typesize > 16 ? KeyedUShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedUShortStructPubSubType::~KeyedUShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool KeyedUShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool KeyedUShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool KeyedUShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool KeyedUShortStructPubSubType::deserialize( return true; } -std::function KeyedUShortStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedUShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedUShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedUShortStructPubSubType::create_data() { return reinterpret_cast(new KeyedUShortStruct()); } -void KeyedUShortStructPubSubType::deleteData( +void KeyedUShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedUShortStructPubSubType::getKey( +bool KeyedUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool KeyedUShortStructPubSubType::getKey( const KeyedUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedUShortStruct_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 || KeyedUShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void KeyedUShortStructPubSubType::register_type_object_representation() KeyedLongStructPubSubType::KeyedLongStructPubSubType() { - setName("KeyedLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedLongStruct::getMaxCdrSerializedSize()); -#else - KeyedLongStruct_max_cdr_typesize; -#endif + set_name("KeyedLongStruct"); + uint32_t type_size = KeyedLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedLongStruct_max_key_cdr_typesize > 16 ? KeyedLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedLongStruct_max_key_cdr_typesize > 16 ? KeyedLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedLongStructPubSubType::~KeyedLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool KeyedLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool KeyedLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool KeyedLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool KeyedLongStructPubSubType::deserialize( return true; } -std::function KeyedLongStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedLongStructPubSubType::create_data() { return reinterpret_cast(new KeyedLongStruct()); } -void KeyedLongStructPubSubType::deleteData( +void KeyedLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedLongStructPubSubType::getKey( +bool KeyedLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool KeyedLongStructPubSubType::getKey( const KeyedLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedLongStruct_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 || KeyedLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void KeyedLongStructPubSubType::register_type_object_representation() KeyedULongStructPubSubType::KeyedULongStructPubSubType() { - setName("KeyedULongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedULongStruct::getMaxCdrSerializedSize()); -#else - KeyedULongStruct_max_cdr_typesize; -#endif + set_name("KeyedULongStruct"); + uint32_t type_size = KeyedULongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedULongStruct_max_key_cdr_typesize > 16 ? KeyedULongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedULongStruct_max_key_cdr_typesize > 16 ? KeyedULongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedULongStructPubSubType::~KeyedULongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool KeyedULongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool KeyedULongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool KeyedULongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool KeyedULongStructPubSubType::deserialize( return true; } -std::function KeyedULongStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedULongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedULongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedULongStructPubSubType::create_data() { return reinterpret_cast(new KeyedULongStruct()); } -void KeyedULongStructPubSubType::deleteData( +void KeyedULongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedULongStructPubSubType::getKey( +bool KeyedULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool KeyedULongStructPubSubType::getKey( const KeyedULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedULongStruct_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 || KeyedULongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void KeyedULongStructPubSubType::register_type_object_representation() KeyedLongLongStructPubSubType::KeyedLongLongStructPubSubType() { - setName("KeyedLongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedLongLongStruct::getMaxCdrSerializedSize()); -#else - KeyedLongLongStruct_max_cdr_typesize; -#endif + set_name("KeyedLongLongStruct"); + uint32_t type_size = KeyedLongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedLongLongStruct_max_key_cdr_typesize > 16 ? KeyedLongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedLongLongStruct_max_key_cdr_typesize > 16 ? KeyedLongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedLongLongStructPubSubType::~KeyedLongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool KeyedLongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool KeyedLongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool KeyedLongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool KeyedLongLongStructPubSubType::deserialize( return true; } -std::function KeyedLongLongStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedLongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedLongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedLongLongStructPubSubType::create_data() { return reinterpret_cast(new KeyedLongLongStruct()); } -void KeyedLongLongStructPubSubType::deleteData( +void KeyedLongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedLongLongStructPubSubType::getKey( +bool KeyedLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool KeyedLongLongStructPubSubType::getKey( const KeyedLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedLongLongStruct_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 || KeyedLongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void KeyedLongLongStructPubSubType::register_type_object_representation() KeyedULongLongStructPubSubType::KeyedULongLongStructPubSubType() { - setName("KeyedULongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedULongLongStruct::getMaxCdrSerializedSize()); -#else - KeyedULongLongStruct_max_cdr_typesize; -#endif + set_name("KeyedULongLongStruct"); + uint32_t type_size = KeyedULongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedULongLongStruct_max_key_cdr_typesize > 16 ? KeyedULongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedULongLongStruct_max_key_cdr_typesize > 16 ? KeyedULongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedULongLongStructPubSubType::~KeyedULongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool KeyedULongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool KeyedULongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool KeyedULongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool KeyedULongLongStructPubSubType::deserialize( return true; } -std::function KeyedULongLongStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedULongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedULongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedULongLongStructPubSubType::create_data() { return reinterpret_cast(new KeyedULongLongStruct()); } -void KeyedULongLongStructPubSubType::deleteData( +void KeyedULongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedULongLongStructPubSubType::getKey( +bool KeyedULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool KeyedULongLongStructPubSubType::getKey( const KeyedULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedULongLongStruct_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 || KeyedULongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void KeyedULongLongStructPubSubType::register_type_object_representation() KeyedFloatStructPubSubType::KeyedFloatStructPubSubType() { - setName("KeyedFloatStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedFloatStruct::getMaxCdrSerializedSize()); -#else - KeyedFloatStruct_max_cdr_typesize; -#endif + set_name("KeyedFloatStruct"); + uint32_t type_size = KeyedFloatStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedFloatStruct_max_key_cdr_typesize > 16 ? KeyedFloatStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedFloatStruct_max_key_cdr_typesize > 16 ? KeyedFloatStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedFloatStructPubSubType::~KeyedFloatStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool KeyedFloatStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool KeyedFloatStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool KeyedFloatStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool KeyedFloatStructPubSubType::deserialize( return true; } -std::function KeyedFloatStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedFloatStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedFloatStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedFloatStructPubSubType::create_data() { return reinterpret_cast(new KeyedFloatStruct()); } -void KeyedFloatStructPubSubType::deleteData( +void KeyedFloatStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedFloatStructPubSubType::getKey( +bool KeyedFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool KeyedFloatStructPubSubType::getKey( const KeyedFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedFloatStruct_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 || KeyedFloatStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void KeyedFloatStructPubSubType::register_type_object_representation() KeyedDoubleStructPubSubType::KeyedDoubleStructPubSubType() { - setName("KeyedDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedDoubleStruct::getMaxCdrSerializedSize()); -#else - KeyedDoubleStruct_max_cdr_typesize; -#endif + set_name("KeyedDoubleStruct"); + uint32_t type_size = KeyedDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedDoubleStruct_max_key_cdr_typesize > 16 ? KeyedDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedDoubleStruct_max_key_cdr_typesize > 16 ? KeyedDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedDoubleStructPubSubType::~KeyedDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool KeyedDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool KeyedDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool KeyedDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool KeyedDoubleStructPubSubType::deserialize( return true; } -std::function KeyedDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedDoubleStructPubSubType::create_data() { return reinterpret_cast(new KeyedDoubleStruct()); } -void KeyedDoubleStructPubSubType::deleteData( +void KeyedDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedDoubleStructPubSubType::getKey( +bool KeyedDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool KeyedDoubleStructPubSubType::getKey( const KeyedDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedDoubleStruct_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 || KeyedDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void KeyedDoubleStructPubSubType::register_type_object_representation() KeyedLongDoubleStructPubSubType::KeyedLongDoubleStructPubSubType() { - setName("KeyedLongDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedLongDoubleStruct::getMaxCdrSerializedSize()); -#else - KeyedLongDoubleStruct_max_cdr_typesize; -#endif + set_name("KeyedLongDoubleStruct"); + uint32_t type_size = KeyedLongDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedLongDoubleStruct_max_key_cdr_typesize > 16 ? KeyedLongDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedLongDoubleStruct_max_key_cdr_typesize > 16 ? KeyedLongDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedLongDoubleStructPubSubType::~KeyedLongDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool KeyedLongDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool KeyedLongDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool KeyedLongDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool KeyedLongDoubleStructPubSubType::deserialize( return true; } -std::function KeyedLongDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedLongDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedLongDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedLongDoubleStructPubSubType::create_data() { return reinterpret_cast(new KeyedLongDoubleStruct()); } -void KeyedLongDoubleStructPubSubType::deleteData( +void KeyedLongDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedLongDoubleStructPubSubType::getKey( +bool KeyedLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool KeyedLongDoubleStructPubSubType::getKey( const KeyedLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedLongDoubleStruct_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 || KeyedLongDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void KeyedLongDoubleStructPubSubType::register_type_object_representation() KeyedBooleanStructPubSubType::KeyedBooleanStructPubSubType() { - setName("KeyedBooleanStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedBooleanStruct::getMaxCdrSerializedSize()); -#else - KeyedBooleanStruct_max_cdr_typesize; -#endif + set_name("KeyedBooleanStruct"); + uint32_t type_size = KeyedBooleanStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedBooleanStruct_max_key_cdr_typesize > 16 ? KeyedBooleanStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedBooleanStruct_max_key_cdr_typesize > 16 ? KeyedBooleanStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedBooleanStructPubSubType::~KeyedBooleanStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool KeyedBooleanStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool KeyedBooleanStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool KeyedBooleanStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool KeyedBooleanStructPubSubType::deserialize( return true; } -std::function KeyedBooleanStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedBooleanStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedBooleanStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedBooleanStructPubSubType::create_data() { return reinterpret_cast(new KeyedBooleanStruct()); } -void KeyedBooleanStructPubSubType::deleteData( +void KeyedBooleanStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedBooleanStructPubSubType::getKey( +bool KeyedBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool KeyedBooleanStructPubSubType::getKey( const KeyedBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedBooleanStruct_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 || KeyedBooleanStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void KeyedBooleanStructPubSubType::register_type_object_representation() KeyedOctetStructPubSubType::KeyedOctetStructPubSubType() { - setName("KeyedOctetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedOctetStruct::getMaxCdrSerializedSize()); -#else - KeyedOctetStruct_max_cdr_typesize; -#endif + set_name("KeyedOctetStruct"); + uint32_t type_size = KeyedOctetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedOctetStruct_max_key_cdr_typesize > 16 ? KeyedOctetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedOctetStruct_max_key_cdr_typesize > 16 ? KeyedOctetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedOctetStructPubSubType::~KeyedOctetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool KeyedOctetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool KeyedOctetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool KeyedOctetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool KeyedOctetStructPubSubType::deserialize( return true; } -std::function KeyedOctetStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedOctetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedOctetStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedOctetStructPubSubType::create_data() { return reinterpret_cast(new KeyedOctetStruct()); } -void KeyedOctetStructPubSubType::deleteData( +void KeyedOctetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedOctetStructPubSubType::getKey( +bool KeyedOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool KeyedOctetStructPubSubType::getKey( const KeyedOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedOctetStruct_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 || KeyedOctetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void KeyedOctetStructPubSubType::register_type_object_representation() KeyedCharStructPubSubType::KeyedCharStructPubSubType() { - setName("KeyedCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedCharStruct::getMaxCdrSerializedSize()); -#else - KeyedCharStruct_max_cdr_typesize; -#endif + set_name("KeyedCharStruct"); + uint32_t type_size = KeyedCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedCharStruct_max_key_cdr_typesize > 16 ? KeyedCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedCharStruct_max_key_cdr_typesize > 16 ? KeyedCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedCharStructPubSubType::~KeyedCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool KeyedCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool KeyedCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool KeyedCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool KeyedCharStructPubSubType::deserialize( return true; } -std::function KeyedCharStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedCharStructPubSubType::create_data() { return reinterpret_cast(new KeyedCharStruct()); } -void KeyedCharStructPubSubType::deleteData( +void KeyedCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedCharStructPubSubType::getKey( +bool KeyedCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool KeyedCharStructPubSubType::getKey( const KeyedCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedCharStruct_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 || KeyedCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void KeyedCharStructPubSubType::register_type_object_representation() KeyedWCharStructPubSubType::KeyedWCharStructPubSubType() { - setName("KeyedWCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedWCharStruct::getMaxCdrSerializedSize()); -#else - KeyedWCharStruct_max_cdr_typesize; -#endif + set_name("KeyedWCharStruct"); + uint32_t type_size = KeyedWCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedWCharStruct_max_key_cdr_typesize > 16 ? KeyedWCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedWCharStruct_max_key_cdr_typesize > 16 ? KeyedWCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedWCharStructPubSubType::~KeyedWCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool KeyedWCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool KeyedWCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool KeyedWCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool KeyedWCharStructPubSubType::deserialize( return true; } -std::function KeyedWCharStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedWCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedWCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedWCharStructPubSubType::create_data() { return reinterpret_cast(new KeyedWCharStruct()); } -void KeyedWCharStructPubSubType::deleteData( +void KeyedWCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedWCharStructPubSubType::getKey( +bool KeyedWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool KeyedWCharStructPubSubType::getKey( const KeyedWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedWCharStruct_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 || KeyedWCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void KeyedWCharStructPubSubType::register_type_object_representation() KeyedEmptyStructPubSubType::KeyedEmptyStructPubSubType() { - setName("KeyedEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedEmptyStruct::getMaxCdrSerializedSize()); -#else - KeyedEmptyStruct_max_cdr_typesize; -#endif + set_name("KeyedEmptyStruct"); + uint32_t type_size = KeyedEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedEmptyStruct_max_key_cdr_typesize > 16 ? KeyedEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedEmptyStruct_max_key_cdr_typesize > 16 ? KeyedEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedEmptyStructPubSubType::~KeyedEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool KeyedEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool KeyedEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool KeyedEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool KeyedEmptyStructPubSubType::deserialize( return true; } -std::function KeyedEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedEmptyStructPubSubType::create_data() { return reinterpret_cast(new KeyedEmptyStruct()); } -void KeyedEmptyStructPubSubType::deleteData( +void KeyedEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedEmptyStructPubSubType::getKey( +bool KeyedEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool KeyedEmptyStructPubSubType::getKey( const KeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedEmptyStruct_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 || KeyedEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void KeyedEmptyStructPubSubType::register_type_object_representation() KeyedEmptyInheritanceStructPubSubType::KeyedEmptyInheritanceStructPubSubType() { - setName("KeyedEmptyInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedEmptyInheritanceStruct::getMaxCdrSerializedSize()); -#else - KeyedEmptyInheritanceStruct_max_cdr_typesize; -#endif + set_name("KeyedEmptyInheritanceStruct"); + uint32_t type_size = KeyedEmptyInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? KeyedEmptyInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? KeyedEmptyInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedEmptyInheritanceStructPubSubType::~KeyedEmptyInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool KeyedEmptyInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool KeyedEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool KeyedEmptyInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool KeyedEmptyInheritanceStructPubSubType::deserialize( return true; } -std::function KeyedEmptyInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedEmptyInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedEmptyInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedEmptyInheritanceStructPubSubType::create_data() { return reinterpret_cast(new KeyedEmptyInheritanceStruct()); } -void KeyedEmptyInheritanceStructPubSubType::deleteData( +void KeyedEmptyInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedEmptyInheritanceStructPubSubType::getKey( +bool KeyedEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool KeyedEmptyInheritanceStructPubSubType::getKey( const KeyedEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedEmptyInheritanceStruct_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 || KeyedEmptyInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void KeyedEmptyInheritanceStructPubSubType::register_type_object_representation( KeyedInheritanceStructPubSubType::KeyedInheritanceStructPubSubType() { - setName("KeyedInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyedInheritanceStruct::getMaxCdrSerializedSize()); -#else - KeyedInheritanceStruct_max_cdr_typesize; -#endif + set_name("KeyedInheritanceStruct"); + uint32_t type_size = KeyedInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyedInheritanceStruct_max_key_cdr_typesize > 16 ? KeyedInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyedInheritanceStruct_max_key_cdr_typesize > 16 ? KeyedInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyedInheritanceStructPubSubType::~KeyedInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool KeyedInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool KeyedInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool KeyedInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool KeyedInheritanceStructPubSubType::deserialize( return true; } -std::function KeyedInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t KeyedInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* KeyedInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* KeyedInheritanceStructPubSubType::create_data() { return reinterpret_cast(new KeyedInheritanceStruct()); } -void KeyedInheritanceStructPubSubType::deleteData( +void KeyedInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyedInheritanceStructPubSubType::getKey( +bool KeyedInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool KeyedInheritanceStructPubSubType::getKey( const KeyedInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyedInheritanceStruct_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 || KeyedInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void KeyedInheritanceStructPubSubType::register_type_object_representation() InheritanceKeyedEmptyStructPubSubType::InheritanceKeyedEmptyStructPubSubType() { - setName("InheritanceKeyedEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InheritanceKeyedEmptyStruct::getMaxCdrSerializedSize()); -#else - InheritanceKeyedEmptyStruct_max_cdr_typesize; -#endif + set_name("InheritanceKeyedEmptyStruct"); + uint32_t type_size = InheritanceKeyedEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = InheritanceKeyedEmptyStruct_max_key_cdr_typesize > 16 ? InheritanceKeyedEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = InheritanceKeyedEmptyStruct_max_key_cdr_typesize > 16 ? InheritanceKeyedEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InheritanceKeyedEmptyStructPubSubType::~InheritanceKeyedEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool InheritanceKeyedEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool InheritanceKeyedEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool InheritanceKeyedEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool InheritanceKeyedEmptyStructPubSubType::deserialize( return true; } -std::function InheritanceKeyedEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t InheritanceKeyedEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* InheritanceKeyedEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* InheritanceKeyedEmptyStructPubSubType::create_data() { return reinterpret_cast(new InheritanceKeyedEmptyStruct()); } -void InheritanceKeyedEmptyStructPubSubType::deleteData( +void InheritanceKeyedEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InheritanceKeyedEmptyStructPubSubType::getKey( +bool InheritanceKeyedEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool InheritanceKeyedEmptyStructPubSubType::getKey( const InheritanceKeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InheritanceKeyedEmptyStruct_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 || InheritanceKeyedEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index 3a1c7d3e6ac..8c53b9f3532 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -61,18 +61,18 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -135,18 +135,18 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -181,8 +181,8 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -209,18 +209,18 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -255,8 +255,8 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -283,18 +283,18 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -329,8 +329,8 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -357,18 +357,18 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -403,8 +403,8 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -431,18 +431,18 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -477,8 +477,8 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -505,18 +505,18 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -551,8 +551,8 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -579,18 +579,18 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -625,8 +625,8 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -653,18 +653,18 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -699,8 +699,8 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -727,18 +727,18 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -773,8 +773,8 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -801,18 +801,18 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -847,8 +847,8 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -875,18 +875,18 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -921,8 +921,8 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -949,18 +949,18 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -995,8 +995,8 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1023,18 +1023,18 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1069,8 +1069,8 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1097,18 +1097,18 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1143,8 +1143,8 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1171,18 +1171,18 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1217,8 +1217,8 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1245,18 +1245,18 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1291,8 +1291,8 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/mapsPubSubTypes.cxx b/test/dds-types-test/mapsPubSubTypes.cxx index 3107283f9df..7bdf6195341 100644 --- a/test/dds-types-test/mapsPubSubTypes.cxx +++ b/test/dds-types-test/mapsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; MapShortShortPubSubType::MapShortShortPubSubType() { - setName("MapShortShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortShort::getMaxCdrSerializedSize()); -#else - MapShortShort_max_cdr_typesize; -#endif + set_name("MapShortShort"); + uint32_t type_size = MapShortShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortShort_max_key_cdr_typesize > 16 ? MapShortShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortShort_max_key_cdr_typesize > 16 ? MapShortShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortShortPubSubType::~MapShortShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool MapShortShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool MapShortShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool MapShortShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool MapShortShortPubSubType::deserialize( return true; } -std::function MapShortShortPubSubType::getSerializedSizeProvider( +uint32_t MapShortShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortShortPubSubType::createData() +void* MapShortShortPubSubType::create_data() { return reinterpret_cast(new MapShortShort()); } -void MapShortShortPubSubType::deleteData( +void MapShortShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortShortPubSubType::getKey( +bool MapShortShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool MapShortShortPubSubType::getKey( const MapShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortShort_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 || MapShortShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void MapShortShortPubSubType::register_type_object_representation() MapShortUShortPubSubType::MapShortUShortPubSubType() { - setName("MapShortUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortUShort::getMaxCdrSerializedSize()); -#else - MapShortUShort_max_cdr_typesize; -#endif + set_name("MapShortUShort"); + uint32_t type_size = MapShortUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortUShort_max_key_cdr_typesize > 16 ? MapShortUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortUShort_max_key_cdr_typesize > 16 ? MapShortUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortUShortPubSubType::~MapShortUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool MapShortUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool MapShortUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool MapShortUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool MapShortUShortPubSubType::deserialize( return true; } -std::function MapShortUShortPubSubType::getSerializedSizeProvider( +uint32_t MapShortUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortUShortPubSubType::createData() +void* MapShortUShortPubSubType::create_data() { return reinterpret_cast(new MapShortUShort()); } -void MapShortUShortPubSubType::deleteData( +void MapShortUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortUShortPubSubType::getKey( +bool MapShortUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool MapShortUShortPubSubType::getKey( const MapShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortUShort_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 || MapShortUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void MapShortUShortPubSubType::register_type_object_representation() MapShortLongPubSubType::MapShortLongPubSubType() { - setName("MapShortLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortLong::getMaxCdrSerializedSize()); -#else - MapShortLong_max_cdr_typesize; -#endif + set_name("MapShortLong"); + uint32_t type_size = MapShortLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortLong_max_key_cdr_typesize > 16 ? MapShortLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortLong_max_key_cdr_typesize > 16 ? MapShortLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortLongPubSubType::~MapShortLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool MapShortLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool MapShortLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool MapShortLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool MapShortLongPubSubType::deserialize( return true; } -std::function MapShortLongPubSubType::getSerializedSizeProvider( +uint32_t MapShortLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortLongPubSubType::createData() +void* MapShortLongPubSubType::create_data() { return reinterpret_cast(new MapShortLong()); } -void MapShortLongPubSubType::deleteData( +void MapShortLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortLongPubSubType::getKey( +bool MapShortLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool MapShortLongPubSubType::getKey( const MapShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortLong_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 || MapShortLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void MapShortLongPubSubType::register_type_object_representation() MapShortULongPubSubType::MapShortULongPubSubType() { - setName("MapShortULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortULong::getMaxCdrSerializedSize()); -#else - MapShortULong_max_cdr_typesize; -#endif + set_name("MapShortULong"); + uint32_t type_size = MapShortULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortULong_max_key_cdr_typesize > 16 ? MapShortULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortULong_max_key_cdr_typesize > 16 ? MapShortULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortULongPubSubType::~MapShortULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool MapShortULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool MapShortULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool MapShortULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool MapShortULongPubSubType::deserialize( return true; } -std::function MapShortULongPubSubType::getSerializedSizeProvider( +uint32_t MapShortULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortULongPubSubType::createData() +void* MapShortULongPubSubType::create_data() { return reinterpret_cast(new MapShortULong()); } -void MapShortULongPubSubType::deleteData( +void MapShortULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortULongPubSubType::getKey( +bool MapShortULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool MapShortULongPubSubType::getKey( const MapShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortULong_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 || MapShortULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void MapShortULongPubSubType::register_type_object_representation() MapShortLongLongPubSubType::MapShortLongLongPubSubType() { - setName("MapShortLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortLongLong::getMaxCdrSerializedSize()); -#else - MapShortLongLong_max_cdr_typesize; -#endif + set_name("MapShortLongLong"); + uint32_t type_size = MapShortLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortLongLong_max_key_cdr_typesize > 16 ? MapShortLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortLongLong_max_key_cdr_typesize > 16 ? MapShortLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortLongLongPubSubType::~MapShortLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool MapShortLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool MapShortLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool MapShortLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool MapShortLongLongPubSubType::deserialize( return true; } -std::function MapShortLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapShortLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortLongLongPubSubType::createData() +void* MapShortLongLongPubSubType::create_data() { return reinterpret_cast(new MapShortLongLong()); } -void MapShortLongLongPubSubType::deleteData( +void MapShortLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortLongLongPubSubType::getKey( +bool MapShortLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool MapShortLongLongPubSubType::getKey( const MapShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortLongLong_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 || MapShortLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void MapShortLongLongPubSubType::register_type_object_representation() MapShortULongLongPubSubType::MapShortULongLongPubSubType() { - setName("MapShortULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortULongLong::getMaxCdrSerializedSize()); -#else - MapShortULongLong_max_cdr_typesize; -#endif + set_name("MapShortULongLong"); + uint32_t type_size = MapShortULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortULongLong_max_key_cdr_typesize > 16 ? MapShortULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortULongLong_max_key_cdr_typesize > 16 ? MapShortULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortULongLongPubSubType::~MapShortULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool MapShortULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool MapShortULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool MapShortULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool MapShortULongLongPubSubType::deserialize( return true; } -std::function MapShortULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapShortULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortULongLongPubSubType::createData() +void* MapShortULongLongPubSubType::create_data() { return reinterpret_cast(new MapShortULongLong()); } -void MapShortULongLongPubSubType::deleteData( +void MapShortULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortULongLongPubSubType::getKey( +bool MapShortULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool MapShortULongLongPubSubType::getKey( const MapShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortULongLong_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 || MapShortULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void MapShortULongLongPubSubType::register_type_object_representation() MapShortFloatPubSubType::MapShortFloatPubSubType() { - setName("MapShortFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortFloat::getMaxCdrSerializedSize()); -#else - MapShortFloat_max_cdr_typesize; -#endif + set_name("MapShortFloat"); + uint32_t type_size = MapShortFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortFloat_max_key_cdr_typesize > 16 ? MapShortFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortFloat_max_key_cdr_typesize > 16 ? MapShortFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortFloatPubSubType::~MapShortFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool MapShortFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool MapShortFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool MapShortFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool MapShortFloatPubSubType::deserialize( return true; } -std::function MapShortFloatPubSubType::getSerializedSizeProvider( +uint32_t MapShortFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortFloatPubSubType::createData() +void* MapShortFloatPubSubType::create_data() { return reinterpret_cast(new MapShortFloat()); } -void MapShortFloatPubSubType::deleteData( +void MapShortFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortFloatPubSubType::getKey( +bool MapShortFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool MapShortFloatPubSubType::getKey( const MapShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortFloat_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 || MapShortFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void MapShortFloatPubSubType::register_type_object_representation() MapShortDoublePubSubType::MapShortDoublePubSubType() { - setName("MapShortDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortDouble::getMaxCdrSerializedSize()); -#else - MapShortDouble_max_cdr_typesize; -#endif + set_name("MapShortDouble"); + uint32_t type_size = MapShortDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortDouble_max_key_cdr_typesize > 16 ? MapShortDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortDouble_max_key_cdr_typesize > 16 ? MapShortDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortDoublePubSubType::~MapShortDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool MapShortDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool MapShortDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool MapShortDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool MapShortDoublePubSubType::deserialize( return true; } -std::function MapShortDoublePubSubType::getSerializedSizeProvider( +uint32_t MapShortDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortDoublePubSubType::createData() +void* MapShortDoublePubSubType::create_data() { return reinterpret_cast(new MapShortDouble()); } -void MapShortDoublePubSubType::deleteData( +void MapShortDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortDoublePubSubType::getKey( +bool MapShortDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool MapShortDoublePubSubType::getKey( const MapShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortDouble_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 || MapShortDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void MapShortDoublePubSubType::register_type_object_representation() MapShortLongDoublePubSubType::MapShortLongDoublePubSubType() { - setName("MapShortLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortLongDouble::getMaxCdrSerializedSize()); -#else - MapShortLongDouble_max_cdr_typesize; -#endif + set_name("MapShortLongDouble"); + uint32_t type_size = MapShortLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortLongDouble_max_key_cdr_typesize > 16 ? MapShortLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortLongDouble_max_key_cdr_typesize > 16 ? MapShortLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortLongDoublePubSubType::~MapShortLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool MapShortLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool MapShortLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool MapShortLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool MapShortLongDoublePubSubType::deserialize( return true; } -std::function MapShortLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapShortLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortLongDoublePubSubType::createData() +void* MapShortLongDoublePubSubType::create_data() { return reinterpret_cast(new MapShortLongDouble()); } -void MapShortLongDoublePubSubType::deleteData( +void MapShortLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortLongDoublePubSubType::getKey( +bool MapShortLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool MapShortLongDoublePubSubType::getKey( const MapShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortLongDouble_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 || MapShortLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void MapShortLongDoublePubSubType::register_type_object_representation() MapShortBooleanPubSubType::MapShortBooleanPubSubType() { - setName("MapShortBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortBoolean::getMaxCdrSerializedSize()); -#else - MapShortBoolean_max_cdr_typesize; -#endif + set_name("MapShortBoolean"); + uint32_t type_size = MapShortBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortBoolean_max_key_cdr_typesize > 16 ? MapShortBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortBoolean_max_key_cdr_typesize > 16 ? MapShortBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortBooleanPubSubType::~MapShortBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool MapShortBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool MapShortBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool MapShortBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool MapShortBooleanPubSubType::deserialize( return true; } -std::function MapShortBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapShortBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortBooleanPubSubType::createData() +void* MapShortBooleanPubSubType::create_data() { return reinterpret_cast(new MapShortBoolean()); } -void MapShortBooleanPubSubType::deleteData( +void MapShortBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortBooleanPubSubType::getKey( +bool MapShortBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool MapShortBooleanPubSubType::getKey( const MapShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortBoolean_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 || MapShortBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void MapShortBooleanPubSubType::register_type_object_representation() MapShortOctetPubSubType::MapShortOctetPubSubType() { - setName("MapShortOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortOctet::getMaxCdrSerializedSize()); -#else - MapShortOctet_max_cdr_typesize; -#endif + set_name("MapShortOctet"); + uint32_t type_size = MapShortOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortOctet_max_key_cdr_typesize > 16 ? MapShortOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortOctet_max_key_cdr_typesize > 16 ? MapShortOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortOctetPubSubType::~MapShortOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool MapShortOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool MapShortOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool MapShortOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool MapShortOctetPubSubType::deserialize( return true; } -std::function MapShortOctetPubSubType::getSerializedSizeProvider( +uint32_t MapShortOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortOctetPubSubType::createData() +void* MapShortOctetPubSubType::create_data() { return reinterpret_cast(new MapShortOctet()); } -void MapShortOctetPubSubType::deleteData( +void MapShortOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortOctetPubSubType::getKey( +bool MapShortOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool MapShortOctetPubSubType::getKey( const MapShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortOctet_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 || MapShortOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void MapShortOctetPubSubType::register_type_object_representation() MapShortCharPubSubType::MapShortCharPubSubType() { - setName("MapShortChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortChar::getMaxCdrSerializedSize()); -#else - MapShortChar_max_cdr_typesize; -#endif + set_name("MapShortChar"); + uint32_t type_size = MapShortChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortChar_max_key_cdr_typesize > 16 ? MapShortChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortChar_max_key_cdr_typesize > 16 ? MapShortChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortCharPubSubType::~MapShortCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool MapShortCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool MapShortCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool MapShortCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool MapShortCharPubSubType::deserialize( return true; } -std::function MapShortCharPubSubType::getSerializedSizeProvider( +uint32_t MapShortCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortCharPubSubType::createData() +void* MapShortCharPubSubType::create_data() { return reinterpret_cast(new MapShortChar()); } -void MapShortCharPubSubType::deleteData( +void MapShortCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortCharPubSubType::getKey( +bool MapShortCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool MapShortCharPubSubType::getKey( const MapShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortChar_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 || MapShortChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void MapShortCharPubSubType::register_type_object_representation() MapShortWCharPubSubType::MapShortWCharPubSubType() { - setName("MapShortWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortWChar::getMaxCdrSerializedSize()); -#else - MapShortWChar_max_cdr_typesize; -#endif + set_name("MapShortWChar"); + uint32_t type_size = MapShortWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortWChar_max_key_cdr_typesize > 16 ? MapShortWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortWChar_max_key_cdr_typesize > 16 ? MapShortWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortWCharPubSubType::~MapShortWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool MapShortWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool MapShortWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool MapShortWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool MapShortWCharPubSubType::deserialize( return true; } -std::function MapShortWCharPubSubType::getSerializedSizeProvider( +uint32_t MapShortWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortWCharPubSubType::createData() +void* MapShortWCharPubSubType::create_data() { return reinterpret_cast(new MapShortWChar()); } -void MapShortWCharPubSubType::deleteData( +void MapShortWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortWCharPubSubType::getKey( +bool MapShortWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool MapShortWCharPubSubType::getKey( const MapShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortWChar_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 || MapShortWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void MapShortWCharPubSubType::register_type_object_representation() MapShortStringPubSubType::MapShortStringPubSubType() { - setName("MapShortString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortString::getMaxCdrSerializedSize()); -#else - MapShortString_max_cdr_typesize; -#endif + set_name("MapShortString"); + uint32_t type_size = MapShortString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortString_max_key_cdr_typesize > 16 ? MapShortString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortString_max_key_cdr_typesize > 16 ? MapShortString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortStringPubSubType::~MapShortStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool MapShortStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool MapShortStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool MapShortStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool MapShortStringPubSubType::deserialize( return true; } -std::function MapShortStringPubSubType::getSerializedSizeProvider( +uint32_t MapShortStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortStringPubSubType::createData() +void* MapShortStringPubSubType::create_data() { return reinterpret_cast(new MapShortString()); } -void MapShortStringPubSubType::deleteData( +void MapShortStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortStringPubSubType::getKey( +bool MapShortStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool MapShortStringPubSubType::getKey( const MapShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortString_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 || MapShortString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void MapShortStringPubSubType::register_type_object_representation() MapShortWStringPubSubType::MapShortWStringPubSubType() { - setName("MapShortWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortWString::getMaxCdrSerializedSize()); -#else - MapShortWString_max_cdr_typesize; -#endif + set_name("MapShortWString"); + uint32_t type_size = MapShortWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortWString_max_key_cdr_typesize > 16 ? MapShortWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortWString_max_key_cdr_typesize > 16 ? MapShortWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortWStringPubSubType::~MapShortWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool MapShortWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool MapShortWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool MapShortWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool MapShortWStringPubSubType::deserialize( return true; } -std::function MapShortWStringPubSubType::getSerializedSizeProvider( +uint32_t MapShortWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortWStringPubSubType::createData() +void* MapShortWStringPubSubType::create_data() { return reinterpret_cast(new MapShortWString()); } -void MapShortWStringPubSubType::deleteData( +void MapShortWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortWStringPubSubType::getKey( +bool MapShortWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool MapShortWStringPubSubType::getKey( const MapShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortWString_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 || MapShortWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void MapShortWStringPubSubType::register_type_object_representation() MapShortInnerAliasBoundedStringHelperPubSubType::MapShortInnerAliasBoundedStringHelperPubSubType() { - setName("MapShortInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasBoundedStringHelper"); + uint32_t type_size = MapShortInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasBoundedStringHelperPubSubType::~MapShortInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasBoundedStringHelperPubSubType::createData() +void* MapShortInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasBoundedStringHelper()); } -void MapShortInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapShortInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::getKey( const MapShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasBoundedStringHelper_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 || MapShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void MapShortInnerAliasBoundedStringHelperPubSubType::register_type_object_repre MapShortInnerAliasBoundedWStringHelperPubSubType::MapShortInnerAliasBoundedWStringHelperPubSubType() { - setName("MapShortInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapShortInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasBoundedWStringHelperPubSubType::~MapShortInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapShortInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasBoundedWStringHelper()); } -void MapShortInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapShortInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::getKey( const MapShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasBoundedWStringHelper_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 || MapShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void MapShortInnerAliasBoundedWStringHelperPubSubType::register_type_object_repr MapShortInnerEnumHelperPubSubType::MapShortInnerEnumHelperPubSubType() { - setName("MapShortInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerEnumHelper"); + uint32_t type_size = MapShortInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerEnumHelper_max_key_cdr_typesize > 16 ? MapShortInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerEnumHelper_max_key_cdr_typesize > 16 ? MapShortInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerEnumHelperPubSubType::~MapShortInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool MapShortInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool MapShortInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool MapShortInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool MapShortInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapShortInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerEnumHelperPubSubType::createData() +void* MapShortInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerEnumHelper()); } -void MapShortInnerEnumHelperPubSubType::deleteData( +void MapShortInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerEnumHelperPubSubType::getKey( +bool MapShortInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool MapShortInnerEnumHelperPubSubType::getKey( const MapShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerEnumHelper_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 || MapShortInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void MapShortInnerEnumHelperPubSubType::register_type_object_representation() MapShortInnerBitMaskHelperPubSubType::MapShortInnerBitMaskHelperPubSubType() { - setName("MapShortInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerBitMaskHelper"); + uint32_t type_size = MapShortInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapShortInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapShortInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerBitMaskHelperPubSubType::~MapShortInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool MapShortInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool MapShortInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool MapShortInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool MapShortInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapShortInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerBitMaskHelperPubSubType::createData() +void* MapShortInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerBitMaskHelper()); } -void MapShortInnerBitMaskHelperPubSubType::deleteData( +void MapShortInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerBitMaskHelperPubSubType::getKey( +bool MapShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool MapShortInnerBitMaskHelperPubSubType::getKey( const MapShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerBitMaskHelper_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 || MapShortInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void MapShortInnerBitMaskHelperPubSubType::register_type_object_representation() MapShortInnerAliasHelperPubSubType::MapShortInnerAliasHelperPubSubType() { - setName("MapShortInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasHelper"); + uint32_t type_size = MapShortInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasHelperPubSubType::~MapShortInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool MapShortInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool MapShortInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool MapShortInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool MapShortInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasHelperPubSubType::createData() +void* MapShortInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasHelper()); } -void MapShortInnerAliasHelperPubSubType::deleteData( +void MapShortInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasHelperPubSubType::getKey( +bool MapShortInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool MapShortInnerAliasHelperPubSubType::getKey( const MapShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasHelper_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 || MapShortInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void MapShortInnerAliasHelperPubSubType::register_type_object_representation() MapShortInnerAliasArrayHelperPubSubType::MapShortInnerAliasArrayHelperPubSubType() { - setName("MapShortInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasArrayHelper"); + uint32_t type_size = MapShortInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasArrayHelperPubSubType::~MapShortInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool MapShortInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool MapShortInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool MapShortInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool MapShortInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasArrayHelperPubSubType::createData() +void* MapShortInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasArrayHelper()); } -void MapShortInnerAliasArrayHelperPubSubType::deleteData( +void MapShortInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasArrayHelperPubSubType::getKey( +bool MapShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool MapShortInnerAliasArrayHelperPubSubType::getKey( const MapShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasArrayHelper_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 || MapShortInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void MapShortInnerAliasArrayHelperPubSubType::register_type_object_representatio MapShortInnerAliasSequenceHelperPubSubType::MapShortInnerAliasSequenceHelperPubSubType() { - setName("MapShortInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasSequenceHelper"); + uint32_t type_size = MapShortInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasSequenceHelperPubSubType::~MapShortInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool MapShortInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool MapShortInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasSequenceHelperPubSubType::createData() +void* MapShortInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasSequenceHelper()); } -void MapShortInnerAliasSequenceHelperPubSubType::deleteData( +void MapShortInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasSequenceHelperPubSubType::getKey( +bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool MapShortInnerAliasSequenceHelperPubSubType::getKey( const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasSequenceHelper_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 || MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void MapShortInnerAliasSequenceHelperPubSubType::register_type_object_representa MapShortInnerAliasMapHelperPubSubType::MapShortInnerAliasMapHelperPubSubType() { - setName("MapShortInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerAliasMapHelper"); + uint32_t type_size = MapShortInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerAliasMapHelperPubSubType::~MapShortInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool MapShortInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool MapShortInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool MapShortInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool MapShortInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapShortInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerAliasMapHelperPubSubType::createData() +void* MapShortInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerAliasMapHelper()); } -void MapShortInnerAliasMapHelperPubSubType::deleteData( +void MapShortInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerAliasMapHelperPubSubType::getKey( +bool MapShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool MapShortInnerAliasMapHelperPubSubType::getKey( const MapShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerAliasMapHelper_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 || MapShortInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void MapShortInnerAliasMapHelperPubSubType::register_type_object_representation( MapShortInnerUnionHelperPubSubType::MapShortInnerUnionHelperPubSubType() { - setName("MapShortInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerUnionHelper"); + uint32_t type_size = MapShortInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapShortInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapShortInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerUnionHelperPubSubType::~MapShortInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool MapShortInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool MapShortInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool MapShortInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool MapShortInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapShortInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerUnionHelperPubSubType::createData() +void* MapShortInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerUnionHelper()); } -void MapShortInnerUnionHelperPubSubType::deleteData( +void MapShortInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerUnionHelperPubSubType::getKey( +bool MapShortInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool MapShortInnerUnionHelperPubSubType::getKey( const MapShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerUnionHelper_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 || MapShortInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void MapShortInnerUnionHelperPubSubType::register_type_object_representation() MapShortInnerStructureHelperPubSubType::MapShortInnerStructureHelperPubSubType() { - setName("MapShortInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerStructureHelper"); + uint32_t type_size = MapShortInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapShortInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapShortInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerStructureHelperPubSubType::~MapShortInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool MapShortInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool MapShortInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool MapShortInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool MapShortInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapShortInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerStructureHelperPubSubType::createData() +void* MapShortInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerStructureHelper()); } -void MapShortInnerStructureHelperPubSubType::deleteData( +void MapShortInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerStructureHelperPubSubType::getKey( +bool MapShortInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool MapShortInnerStructureHelperPubSubType::getKey( const MapShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerStructureHelper_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 || MapShortInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void MapShortInnerStructureHelperPubSubType::register_type_object_representation MapShortInnerBitsetHelperPubSubType::MapShortInnerBitsetHelperPubSubType() { - setName("MapShortInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapShortInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapShortInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapShortInnerBitsetHelper"); + uint32_t type_size = MapShortInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapShortInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapShortInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapShortInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapShortInnerBitsetHelperPubSubType::~MapShortInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool MapShortInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool MapShortInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool MapShortInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool MapShortInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapShortInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapShortInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapShortInnerBitsetHelperPubSubType::createData() +void* MapShortInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapShortInnerBitsetHelper()); } -void MapShortInnerBitsetHelperPubSubType::deleteData( +void MapShortInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapShortInnerBitsetHelperPubSubType::getKey( +bool MapShortInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool MapShortInnerBitsetHelperPubSubType::getKey( const MapShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapShortInnerBitsetHelper_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 || MapShortInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void MapShortInnerBitsetHelperPubSubType::register_type_object_representation() MapUShortShortPubSubType::MapUShortShortPubSubType() { - setName("MapUShortShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortShort::getMaxCdrSerializedSize()); -#else - MapUShortShort_max_cdr_typesize; -#endif + set_name("MapUShortShort"); + uint32_t type_size = MapUShortShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortShort_max_key_cdr_typesize > 16 ? MapUShortShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortShort_max_key_cdr_typesize > 16 ? MapUShortShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortShortPubSubType::~MapUShortShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool MapUShortShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool MapUShortShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool MapUShortShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool MapUShortShortPubSubType::deserialize( return true; } -std::function MapUShortShortPubSubType::getSerializedSizeProvider( +uint32_t MapUShortShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortShortPubSubType::createData() +void* MapUShortShortPubSubType::create_data() { return reinterpret_cast(new MapUShortShort()); } -void MapUShortShortPubSubType::deleteData( +void MapUShortShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortShortPubSubType::getKey( +bool MapUShortShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool MapUShortShortPubSubType::getKey( const MapUShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortShort_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 || MapUShortShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void MapUShortShortPubSubType::register_type_object_representation() MapUShortUShortPubSubType::MapUShortUShortPubSubType() { - setName("MapUShortUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortUShort::getMaxCdrSerializedSize()); -#else - MapUShortUShort_max_cdr_typesize; -#endif + set_name("MapUShortUShort"); + uint32_t type_size = MapUShortUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortUShort_max_key_cdr_typesize > 16 ? MapUShortUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortUShort_max_key_cdr_typesize > 16 ? MapUShortUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortUShortPubSubType::~MapUShortUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool MapUShortUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool MapUShortUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool MapUShortUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool MapUShortUShortPubSubType::deserialize( return true; } -std::function MapUShortUShortPubSubType::getSerializedSizeProvider( +uint32_t MapUShortUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortUShortPubSubType::createData() +void* MapUShortUShortPubSubType::create_data() { return reinterpret_cast(new MapUShortUShort()); } -void MapUShortUShortPubSubType::deleteData( +void MapUShortUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortUShortPubSubType::getKey( +bool MapUShortUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool MapUShortUShortPubSubType::getKey( const MapUShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortUShort_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 || MapUShortUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5437,26 +4541,21 @@ void MapUShortUShortPubSubType::register_type_object_representation() MapUShortLongPubSubType::MapUShortLongPubSubType() { - setName("MapUShortLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortLong::getMaxCdrSerializedSize()); -#else - MapUShortLong_max_cdr_typesize; -#endif + set_name("MapUShortLong"); + uint32_t type_size = MapUShortLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortLong_max_key_cdr_typesize > 16 ? MapUShortLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortLong_max_key_cdr_typesize > 16 ? MapUShortLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortLongPubSubType::~MapUShortLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5474,12 +4573,10 @@ bool MapUShortLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5494,11 +4591,7 @@ bool MapUShortLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5515,11 +4608,7 @@ bool MapUShortLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5536,52 +4625,43 @@ bool MapUShortLongPubSubType::deserialize( return true; } -std::function MapUShortLongPubSubType::getSerializedSizeProvider( +uint32_t MapUShortLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortLongPubSubType::createData() +void* MapUShortLongPubSubType::create_data() { return reinterpret_cast(new MapUShortLong()); } -void MapUShortLongPubSubType::deleteData( +void MapUShortLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortLongPubSubType::getKey( +bool MapUShortLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5589,35 +4669,27 @@ bool MapUShortLongPubSubType::getKey( const MapUShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortLong_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 || MapUShortLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5630,26 +4702,21 @@ void MapUShortLongPubSubType::register_type_object_representation() MapUShortULongPubSubType::MapUShortULongPubSubType() { - setName("MapUShortULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortULong::getMaxCdrSerializedSize()); -#else - MapUShortULong_max_cdr_typesize; -#endif + set_name("MapUShortULong"); + uint32_t type_size = MapUShortULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortULong_max_key_cdr_typesize > 16 ? MapUShortULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortULong_max_key_cdr_typesize > 16 ? MapUShortULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortULongPubSubType::~MapUShortULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5667,12 +4734,10 @@ bool MapUShortULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5687,11 +4752,7 @@ bool MapUShortULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5708,11 +4769,7 @@ bool MapUShortULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5729,52 +4786,43 @@ bool MapUShortULongPubSubType::deserialize( return true; } -std::function MapUShortULongPubSubType::getSerializedSizeProvider( +uint32_t MapUShortULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortULongPubSubType::createData() +void* MapUShortULongPubSubType::create_data() { return reinterpret_cast(new MapUShortULong()); } -void MapUShortULongPubSubType::deleteData( +void MapUShortULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortULongPubSubType::getKey( +bool MapUShortULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5782,35 +4830,27 @@ bool MapUShortULongPubSubType::getKey( const MapUShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortULong_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 || MapUShortULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5823,26 +4863,21 @@ void MapUShortULongPubSubType::register_type_object_representation() MapUShortLongLongPubSubType::MapUShortLongLongPubSubType() { - setName("MapUShortLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortLongLong::getMaxCdrSerializedSize()); -#else - MapUShortLongLong_max_cdr_typesize; -#endif + set_name("MapUShortLongLong"); + uint32_t type_size = MapUShortLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortLongLong_max_key_cdr_typesize > 16 ? MapUShortLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortLongLong_max_key_cdr_typesize > 16 ? MapUShortLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortLongLongPubSubType::~MapUShortLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5860,12 +4895,10 @@ bool MapUShortLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5880,11 +4913,7 @@ bool MapUShortLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5901,11 +4930,7 @@ bool MapUShortLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5922,52 +4947,43 @@ bool MapUShortLongLongPubSubType::deserialize( return true; } -std::function MapUShortLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapUShortLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortLongLongPubSubType::createData() +void* MapUShortLongLongPubSubType::create_data() { return reinterpret_cast(new MapUShortLongLong()); } -void MapUShortLongLongPubSubType::deleteData( +void MapUShortLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortLongLongPubSubType::getKey( +bool MapUShortLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5975,35 +4991,27 @@ bool MapUShortLongLongPubSubType::getKey( const MapUShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortLongLong_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 || MapUShortLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6016,26 +5024,21 @@ void MapUShortLongLongPubSubType::register_type_object_representation() MapUShortULongLongPubSubType::MapUShortULongLongPubSubType() { - setName("MapUShortULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortULongLong::getMaxCdrSerializedSize()); -#else - MapUShortULongLong_max_cdr_typesize; -#endif + set_name("MapUShortULongLong"); + uint32_t type_size = MapUShortULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortULongLong_max_key_cdr_typesize > 16 ? MapUShortULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortULongLong_max_key_cdr_typesize > 16 ? MapUShortULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortULongLongPubSubType::~MapUShortULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6053,12 +5056,10 @@ bool MapUShortULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6073,11 +5074,7 @@ bool MapUShortULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6094,11 +5091,7 @@ bool MapUShortULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6115,52 +5108,43 @@ bool MapUShortULongLongPubSubType::deserialize( return true; } -std::function MapUShortULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapUShortULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortULongLongPubSubType::createData() +void* MapUShortULongLongPubSubType::create_data() { return reinterpret_cast(new MapUShortULongLong()); } -void MapUShortULongLongPubSubType::deleteData( +void MapUShortULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortULongLongPubSubType::getKey( +bool MapUShortULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6168,35 +5152,27 @@ bool MapUShortULongLongPubSubType::getKey( const MapUShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortULongLong_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 || MapUShortULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6209,26 +5185,21 @@ void MapUShortULongLongPubSubType::register_type_object_representation() MapUShortFloatPubSubType::MapUShortFloatPubSubType() { - setName("MapUShortFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortFloat::getMaxCdrSerializedSize()); -#else - MapUShortFloat_max_cdr_typesize; -#endif + set_name("MapUShortFloat"); + uint32_t type_size = MapUShortFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortFloat_max_key_cdr_typesize > 16 ? MapUShortFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortFloat_max_key_cdr_typesize > 16 ? MapUShortFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortFloatPubSubType::~MapUShortFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6246,12 +5217,10 @@ bool MapUShortFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6266,11 +5235,7 @@ bool MapUShortFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6287,11 +5252,7 @@ bool MapUShortFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6308,52 +5269,43 @@ bool MapUShortFloatPubSubType::deserialize( return true; } -std::function MapUShortFloatPubSubType::getSerializedSizeProvider( +uint32_t MapUShortFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortFloatPubSubType::createData() +void* MapUShortFloatPubSubType::create_data() { return reinterpret_cast(new MapUShortFloat()); } -void MapUShortFloatPubSubType::deleteData( +void MapUShortFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortFloatPubSubType::getKey( +bool MapUShortFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6361,35 +5313,27 @@ bool MapUShortFloatPubSubType::getKey( const MapUShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortFloat_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 || MapUShortFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6402,26 +5346,21 @@ void MapUShortFloatPubSubType::register_type_object_representation() MapUShortDoublePubSubType::MapUShortDoublePubSubType() { - setName("MapUShortDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortDouble::getMaxCdrSerializedSize()); -#else - MapUShortDouble_max_cdr_typesize; -#endif + set_name("MapUShortDouble"); + uint32_t type_size = MapUShortDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortDouble_max_key_cdr_typesize > 16 ? MapUShortDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortDouble_max_key_cdr_typesize > 16 ? MapUShortDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortDoublePubSubType::~MapUShortDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6439,12 +5378,10 @@ bool MapUShortDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6459,11 +5396,7 @@ bool MapUShortDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6480,11 +5413,7 @@ bool MapUShortDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6501,52 +5430,43 @@ bool MapUShortDoublePubSubType::deserialize( return true; } -std::function MapUShortDoublePubSubType::getSerializedSizeProvider( +uint32_t MapUShortDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortDoublePubSubType::createData() +void* MapUShortDoublePubSubType::create_data() { return reinterpret_cast(new MapUShortDouble()); } -void MapUShortDoublePubSubType::deleteData( +void MapUShortDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortDoublePubSubType::getKey( +bool MapUShortDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6554,35 +5474,27 @@ bool MapUShortDoublePubSubType::getKey( const MapUShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortDouble_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 || MapUShortDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6595,26 +5507,21 @@ void MapUShortDoublePubSubType::register_type_object_representation() MapUShortLongDoublePubSubType::MapUShortLongDoublePubSubType() { - setName("MapUShortLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortLongDouble::getMaxCdrSerializedSize()); -#else - MapUShortLongDouble_max_cdr_typesize; -#endif + set_name("MapUShortLongDouble"); + uint32_t type_size = MapUShortLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortLongDouble_max_key_cdr_typesize > 16 ? MapUShortLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortLongDouble_max_key_cdr_typesize > 16 ? MapUShortLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortLongDoublePubSubType::~MapUShortLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6632,12 +5539,10 @@ bool MapUShortLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6652,11 +5557,7 @@ bool MapUShortLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6673,11 +5574,7 @@ bool MapUShortLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6694,52 +5591,43 @@ bool MapUShortLongDoublePubSubType::deserialize( return true; } -std::function MapUShortLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapUShortLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortLongDoublePubSubType::createData() +void* MapUShortLongDoublePubSubType::create_data() { return reinterpret_cast(new MapUShortLongDouble()); } -void MapUShortLongDoublePubSubType::deleteData( +void MapUShortLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortLongDoublePubSubType::getKey( +bool MapUShortLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6747,35 +5635,27 @@ bool MapUShortLongDoublePubSubType::getKey( const MapUShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortLongDouble_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 || MapUShortLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6788,26 +5668,21 @@ void MapUShortLongDoublePubSubType::register_type_object_representation() MapUShortBooleanPubSubType::MapUShortBooleanPubSubType() { - setName("MapUShortBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortBoolean::getMaxCdrSerializedSize()); -#else - MapUShortBoolean_max_cdr_typesize; -#endif + set_name("MapUShortBoolean"); + uint32_t type_size = MapUShortBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortBoolean_max_key_cdr_typesize > 16 ? MapUShortBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortBoolean_max_key_cdr_typesize > 16 ? MapUShortBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortBooleanPubSubType::~MapUShortBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6825,12 +5700,10 @@ bool MapUShortBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6845,11 +5718,7 @@ bool MapUShortBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6866,11 +5735,7 @@ bool MapUShortBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6887,52 +5752,43 @@ bool MapUShortBooleanPubSubType::deserialize( return true; } -std::function MapUShortBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapUShortBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortBooleanPubSubType::createData() +void* MapUShortBooleanPubSubType::create_data() { return reinterpret_cast(new MapUShortBoolean()); } -void MapUShortBooleanPubSubType::deleteData( +void MapUShortBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortBooleanPubSubType::getKey( +bool MapUShortBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6940,35 +5796,27 @@ bool MapUShortBooleanPubSubType::getKey( const MapUShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortBoolean_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 || MapUShortBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6981,26 +5829,21 @@ void MapUShortBooleanPubSubType::register_type_object_representation() MapUShortOctetPubSubType::MapUShortOctetPubSubType() { - setName("MapUShortOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortOctet::getMaxCdrSerializedSize()); -#else - MapUShortOctet_max_cdr_typesize; -#endif + set_name("MapUShortOctet"); + uint32_t type_size = MapUShortOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortOctet_max_key_cdr_typesize > 16 ? MapUShortOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortOctet_max_key_cdr_typesize > 16 ? MapUShortOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortOctetPubSubType::~MapUShortOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7018,12 +5861,10 @@ bool MapUShortOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7038,11 +5879,7 @@ bool MapUShortOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7059,11 +5896,7 @@ bool MapUShortOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7080,52 +5913,43 @@ bool MapUShortOctetPubSubType::deserialize( return true; } -std::function MapUShortOctetPubSubType::getSerializedSizeProvider( +uint32_t MapUShortOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortOctetPubSubType::createData() +void* MapUShortOctetPubSubType::create_data() { return reinterpret_cast(new MapUShortOctet()); } -void MapUShortOctetPubSubType::deleteData( +void MapUShortOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortOctetPubSubType::getKey( +bool MapUShortOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7133,35 +5957,27 @@ bool MapUShortOctetPubSubType::getKey( const MapUShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortOctet_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 || MapUShortOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7174,26 +5990,21 @@ void MapUShortOctetPubSubType::register_type_object_representation() MapUShortCharPubSubType::MapUShortCharPubSubType() { - setName("MapUShortChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortChar::getMaxCdrSerializedSize()); -#else - MapUShortChar_max_cdr_typesize; -#endif + set_name("MapUShortChar"); + uint32_t type_size = MapUShortChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortChar_max_key_cdr_typesize > 16 ? MapUShortChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortChar_max_key_cdr_typesize > 16 ? MapUShortChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortCharPubSubType::~MapUShortCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7211,12 +6022,10 @@ bool MapUShortCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7231,11 +6040,7 @@ bool MapUShortCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7252,11 +6057,7 @@ bool MapUShortCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7273,52 +6074,43 @@ bool MapUShortCharPubSubType::deserialize( return true; } -std::function MapUShortCharPubSubType::getSerializedSizeProvider( +uint32_t MapUShortCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortCharPubSubType::createData() +void* MapUShortCharPubSubType::create_data() { return reinterpret_cast(new MapUShortChar()); } -void MapUShortCharPubSubType::deleteData( +void MapUShortCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortCharPubSubType::getKey( +bool MapUShortCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7326,35 +6118,27 @@ bool MapUShortCharPubSubType::getKey( const MapUShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortChar_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 || MapUShortChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7367,26 +6151,21 @@ void MapUShortCharPubSubType::register_type_object_representation() MapUShortWCharPubSubType::MapUShortWCharPubSubType() { - setName("MapUShortWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortWChar::getMaxCdrSerializedSize()); -#else - MapUShortWChar_max_cdr_typesize; -#endif + set_name("MapUShortWChar"); + uint32_t type_size = MapUShortWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortWChar_max_key_cdr_typesize > 16 ? MapUShortWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortWChar_max_key_cdr_typesize > 16 ? MapUShortWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortWCharPubSubType::~MapUShortWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7404,12 +6183,10 @@ bool MapUShortWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7424,11 +6201,7 @@ bool MapUShortWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7445,11 +6218,7 @@ bool MapUShortWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7466,52 +6235,43 @@ bool MapUShortWCharPubSubType::deserialize( return true; } -std::function MapUShortWCharPubSubType::getSerializedSizeProvider( +uint32_t MapUShortWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortWCharPubSubType::createData() +void* MapUShortWCharPubSubType::create_data() { return reinterpret_cast(new MapUShortWChar()); } -void MapUShortWCharPubSubType::deleteData( +void MapUShortWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortWCharPubSubType::getKey( +bool MapUShortWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7519,35 +6279,27 @@ bool MapUShortWCharPubSubType::getKey( const MapUShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortWChar_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 || MapUShortWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7560,26 +6312,21 @@ void MapUShortWCharPubSubType::register_type_object_representation() MapUShortStringPubSubType::MapUShortStringPubSubType() { - setName("MapUShortString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortString::getMaxCdrSerializedSize()); -#else - MapUShortString_max_cdr_typesize; -#endif + set_name("MapUShortString"); + uint32_t type_size = MapUShortString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortString_max_key_cdr_typesize > 16 ? MapUShortString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortString_max_key_cdr_typesize > 16 ? MapUShortString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortStringPubSubType::~MapUShortStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7597,12 +6344,10 @@ bool MapUShortStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7617,11 +6362,7 @@ bool MapUShortStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7638,11 +6379,7 @@ bool MapUShortStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7659,52 +6396,43 @@ bool MapUShortStringPubSubType::deserialize( return true; } -std::function MapUShortStringPubSubType::getSerializedSizeProvider( +uint32_t MapUShortStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortStringPubSubType::createData() +void* MapUShortStringPubSubType::create_data() { return reinterpret_cast(new MapUShortString()); } -void MapUShortStringPubSubType::deleteData( +void MapUShortStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortStringPubSubType::getKey( +bool MapUShortStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7712,35 +6440,27 @@ bool MapUShortStringPubSubType::getKey( const MapUShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortString_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 || MapUShortString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7753,26 +6473,21 @@ void MapUShortStringPubSubType::register_type_object_representation() MapUShortWStringPubSubType::MapUShortWStringPubSubType() { - setName("MapUShortWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortWString::getMaxCdrSerializedSize()); -#else - MapUShortWString_max_cdr_typesize; -#endif + set_name("MapUShortWString"); + uint32_t type_size = MapUShortWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortWString_max_key_cdr_typesize > 16 ? MapUShortWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortWString_max_key_cdr_typesize > 16 ? MapUShortWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortWStringPubSubType::~MapUShortWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7790,12 +6505,10 @@ bool MapUShortWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7810,11 +6523,7 @@ bool MapUShortWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7831,11 +6540,7 @@ bool MapUShortWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7852,52 +6557,43 @@ bool MapUShortWStringPubSubType::deserialize( return true; } -std::function MapUShortWStringPubSubType::getSerializedSizeProvider( +uint32_t MapUShortWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortWStringPubSubType::createData() +void* MapUShortWStringPubSubType::create_data() { return reinterpret_cast(new MapUShortWString()); } -void MapUShortWStringPubSubType::deleteData( +void MapUShortWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortWStringPubSubType::getKey( +bool MapUShortWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7905,35 +6601,27 @@ bool MapUShortWStringPubSubType::getKey( const MapUShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortWString_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 || MapUShortWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7946,26 +6634,21 @@ void MapUShortWStringPubSubType::register_type_object_representation() MapUShortInnerAliasBoundedStringHelperPubSubType::MapUShortInnerAliasBoundedStringHelperPubSubType() { - setName("MapUShortInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasBoundedStringHelper"); + uint32_t type_size = MapUShortInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasBoundedStringHelperPubSubType::~MapUShortInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7983,12 +6666,10 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8003,11 +6684,7 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8024,11 +6701,7 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8045,52 +6718,43 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasBoundedStringHelperPubSubType::createData() +void* MapUShortInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasBoundedStringHelper()); } -void MapUShortInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapUShortInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8098,35 +6762,27 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::getKey( const MapUShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasBoundedStringHelper_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 || MapUShortInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8139,26 +6795,21 @@ void MapUShortInnerAliasBoundedStringHelperPubSubType::register_type_object_repr MapUShortInnerAliasBoundedWStringHelperPubSubType::MapUShortInnerAliasBoundedWStringHelperPubSubType() { - setName("MapUShortInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapUShortInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasBoundedWStringHelperPubSubType::~MapUShortInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8176,12 +6827,10 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8196,11 +6845,7 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8217,11 +6862,7 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8238,52 +6879,43 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapUShortInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasBoundedWStringHelper()); } -void MapUShortInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapUShortInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8291,35 +6923,27 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::getKey( const MapUShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasBoundedWStringHelper_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 || MapUShortInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8332,26 +6956,21 @@ void MapUShortInnerAliasBoundedWStringHelperPubSubType::register_type_object_rep MapUShortInnerEnumHelperPubSubType::MapUShortInnerEnumHelperPubSubType() { - setName("MapUShortInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerEnumHelper"); + uint32_t type_size = MapUShortInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerEnumHelper_max_key_cdr_typesize > 16 ? MapUShortInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerEnumHelper_max_key_cdr_typesize > 16 ? MapUShortInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerEnumHelperPubSubType::~MapUShortInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8369,12 +6988,10 @@ bool MapUShortInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8389,11 +7006,7 @@ bool MapUShortInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8410,11 +7023,7 @@ bool MapUShortInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8431,52 +7040,43 @@ bool MapUShortInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerEnumHelperPubSubType::createData() +void* MapUShortInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerEnumHelper()); } -void MapUShortInnerEnumHelperPubSubType::deleteData( +void MapUShortInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerEnumHelperPubSubType::getKey( +bool MapUShortInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8484,35 +7084,27 @@ bool MapUShortInnerEnumHelperPubSubType::getKey( const MapUShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerEnumHelper_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 || MapUShortInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8525,26 +7117,21 @@ void MapUShortInnerEnumHelperPubSubType::register_type_object_representation() MapUShortInnerBitMaskHelperPubSubType::MapUShortInnerBitMaskHelperPubSubType() { - setName("MapUShortInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerBitMaskHelper"); + uint32_t type_size = MapUShortInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapUShortInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapUShortInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerBitMaskHelperPubSubType::~MapUShortInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8562,12 +7149,10 @@ bool MapUShortInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8582,11 +7167,7 @@ bool MapUShortInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8603,11 +7184,7 @@ bool MapUShortInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8624,52 +7201,43 @@ bool MapUShortInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerBitMaskHelperPubSubType::createData() +void* MapUShortInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerBitMaskHelper()); } -void MapUShortInnerBitMaskHelperPubSubType::deleteData( +void MapUShortInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerBitMaskHelperPubSubType::getKey( +bool MapUShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8677,35 +7245,27 @@ bool MapUShortInnerBitMaskHelperPubSubType::getKey( const MapUShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerBitMaskHelper_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 || MapUShortInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8718,26 +7278,21 @@ void MapUShortInnerBitMaskHelperPubSubType::register_type_object_representation( MapUShortInnerAliasHelperPubSubType::MapUShortInnerAliasHelperPubSubType() { - setName("MapUShortInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasHelper"); + uint32_t type_size = MapUShortInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasHelperPubSubType::~MapUShortInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8755,12 +7310,10 @@ bool MapUShortInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8775,11 +7328,7 @@ bool MapUShortInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8796,11 +7345,7 @@ bool MapUShortInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8817,52 +7362,43 @@ bool MapUShortInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasHelperPubSubType::createData() +void* MapUShortInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasHelper()); } -void MapUShortInnerAliasHelperPubSubType::deleteData( +void MapUShortInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasHelperPubSubType::getKey( +bool MapUShortInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8870,35 +7406,27 @@ bool MapUShortInnerAliasHelperPubSubType::getKey( const MapUShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasHelper_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 || MapUShortInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8911,26 +7439,21 @@ void MapUShortInnerAliasHelperPubSubType::register_type_object_representation() MapUShortInnerAliasArrayHelperPubSubType::MapUShortInnerAliasArrayHelperPubSubType() { - setName("MapUShortInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasArrayHelper"); + uint32_t type_size = MapUShortInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasArrayHelperPubSubType::~MapUShortInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8948,12 +7471,10 @@ bool MapUShortInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8968,11 +7489,7 @@ bool MapUShortInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8989,11 +7506,7 @@ bool MapUShortInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9010,52 +7523,43 @@ bool MapUShortInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasArrayHelperPubSubType::createData() +void* MapUShortInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasArrayHelper()); } -void MapUShortInnerAliasArrayHelperPubSubType::deleteData( +void MapUShortInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasArrayHelperPubSubType::getKey( +bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9063,35 +7567,27 @@ bool MapUShortInnerAliasArrayHelperPubSubType::getKey( const MapUShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasArrayHelper_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 || MapUShortInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9104,26 +7600,21 @@ void MapUShortInnerAliasArrayHelperPubSubType::register_type_object_representati MapUShortInnerAliasSequenceHelperPubSubType::MapUShortInnerAliasSequenceHelperPubSubType() { - setName("MapUShortInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasSequenceHelper"); + uint32_t type_size = MapUShortInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasSequenceHelperPubSubType::~MapUShortInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9141,12 +7632,10 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9161,11 +7650,7 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9182,11 +7667,7 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9203,52 +7684,43 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasSequenceHelperPubSubType::createData() +void* MapUShortInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasSequenceHelper()); } -void MapUShortInnerAliasSequenceHelperPubSubType::deleteData( +void MapUShortInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasSequenceHelperPubSubType::getKey( +bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9256,35 +7728,27 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::getKey( const MapUShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasSequenceHelper_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 || MapUShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9297,26 +7761,21 @@ void MapUShortInnerAliasSequenceHelperPubSubType::register_type_object_represent MapUShortInnerAliasMapHelperPubSubType::MapUShortInnerAliasMapHelperPubSubType() { - setName("MapUShortInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerAliasMapHelper"); + uint32_t type_size = MapUShortInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapUShortInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerAliasMapHelperPubSubType::~MapUShortInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9334,12 +7793,10 @@ bool MapUShortInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9354,11 +7811,7 @@ bool MapUShortInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9375,11 +7828,7 @@ bool MapUShortInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9396,52 +7845,43 @@ bool MapUShortInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerAliasMapHelperPubSubType::createData() +void* MapUShortInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerAliasMapHelper()); } -void MapUShortInnerAliasMapHelperPubSubType::deleteData( +void MapUShortInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerAliasMapHelperPubSubType::getKey( +bool MapUShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9449,35 +7889,27 @@ bool MapUShortInnerAliasMapHelperPubSubType::getKey( const MapUShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerAliasMapHelper_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 || MapUShortInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9490,26 +7922,21 @@ void MapUShortInnerAliasMapHelperPubSubType::register_type_object_representation MapUShortInnerUnionHelperPubSubType::MapUShortInnerUnionHelperPubSubType() { - setName("MapUShortInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerUnionHelper"); + uint32_t type_size = MapUShortInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapUShortInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapUShortInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerUnionHelperPubSubType::~MapUShortInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9527,12 +7954,10 @@ bool MapUShortInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9547,11 +7972,7 @@ bool MapUShortInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9568,11 +7989,7 @@ bool MapUShortInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9589,52 +8006,43 @@ bool MapUShortInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerUnionHelperPubSubType::createData() +void* MapUShortInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerUnionHelper()); } -void MapUShortInnerUnionHelperPubSubType::deleteData( +void MapUShortInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerUnionHelperPubSubType::getKey( +bool MapUShortInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9642,35 +8050,27 @@ bool MapUShortInnerUnionHelperPubSubType::getKey( const MapUShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerUnionHelper_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 || MapUShortInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9683,26 +8083,21 @@ void MapUShortInnerUnionHelperPubSubType::register_type_object_representation() MapUShortInnerStructureHelperPubSubType::MapUShortInnerStructureHelperPubSubType() { - setName("MapUShortInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerStructureHelper"); + uint32_t type_size = MapUShortInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapUShortInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapUShortInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerStructureHelperPubSubType::~MapUShortInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9720,12 +8115,10 @@ bool MapUShortInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9740,11 +8133,7 @@ bool MapUShortInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9761,11 +8150,7 @@ bool MapUShortInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9782,52 +8167,43 @@ bool MapUShortInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerStructureHelperPubSubType::createData() +void* MapUShortInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerStructureHelper()); } -void MapUShortInnerStructureHelperPubSubType::deleteData( +void MapUShortInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerStructureHelperPubSubType::getKey( +bool MapUShortInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9835,35 +8211,27 @@ bool MapUShortInnerStructureHelperPubSubType::getKey( const MapUShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerStructureHelper_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 || MapUShortInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9876,26 +8244,21 @@ void MapUShortInnerStructureHelperPubSubType::register_type_object_representatio MapUShortInnerBitsetHelperPubSubType::MapUShortInnerBitsetHelperPubSubType() { - setName("MapUShortInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapUShortInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapUShortInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapUShortInnerBitsetHelper"); + uint32_t type_size = MapUShortInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapUShortInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapUShortInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapUShortInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapUShortInnerBitsetHelperPubSubType::~MapUShortInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9913,12 +8276,10 @@ bool MapUShortInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9933,11 +8294,7 @@ bool MapUShortInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9954,11 +8311,7 @@ bool MapUShortInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9975,52 +8328,43 @@ bool MapUShortInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapUShortInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapUShortInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapUShortInnerBitsetHelperPubSubType::createData() +void* MapUShortInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapUShortInnerBitsetHelper()); } -void MapUShortInnerBitsetHelperPubSubType::deleteData( +void MapUShortInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapUShortInnerBitsetHelperPubSubType::getKey( +bool MapUShortInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10028,35 +8372,27 @@ bool MapUShortInnerBitsetHelperPubSubType::getKey( const MapUShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapUShortInnerBitsetHelper_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 || MapUShortInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10069,26 +8405,21 @@ void MapUShortInnerBitsetHelperPubSubType::register_type_object_representation() MapLongShortPubSubType::MapLongShortPubSubType() { - setName("MapLongShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongShort::getMaxCdrSerializedSize()); -#else - MapLongShort_max_cdr_typesize; -#endif + set_name("MapLongShort"); + uint32_t type_size = MapLongShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongShort_max_key_cdr_typesize > 16 ? MapLongShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongShort_max_key_cdr_typesize > 16 ? MapLongShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongShortPubSubType::~MapLongShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10106,12 +8437,10 @@ bool MapLongShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10126,11 +8455,7 @@ bool MapLongShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10147,11 +8472,7 @@ bool MapLongShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10168,52 +8489,43 @@ bool MapLongShortPubSubType::deserialize( return true; } -std::function MapLongShortPubSubType::getSerializedSizeProvider( +uint32_t MapLongShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongShortPubSubType::createData() +void* MapLongShortPubSubType::create_data() { return reinterpret_cast(new MapLongShort()); } -void MapLongShortPubSubType::deleteData( +void MapLongShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongShortPubSubType::getKey( +bool MapLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10221,35 +8533,27 @@ bool MapLongShortPubSubType::getKey( const MapLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongShort_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 || MapLongShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10262,26 +8566,21 @@ void MapLongShortPubSubType::register_type_object_representation() MapLongUShortPubSubType::MapLongUShortPubSubType() { - setName("MapLongUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongUShort::getMaxCdrSerializedSize()); -#else - MapLongUShort_max_cdr_typesize; -#endif + set_name("MapLongUShort"); + uint32_t type_size = MapLongUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongUShort_max_key_cdr_typesize > 16 ? MapLongUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongUShort_max_key_cdr_typesize > 16 ? MapLongUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongUShortPubSubType::~MapLongUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10299,12 +8598,10 @@ bool MapLongUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10319,11 +8616,7 @@ bool MapLongUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10340,11 +8633,7 @@ bool MapLongUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10361,52 +8650,43 @@ bool MapLongUShortPubSubType::deserialize( return true; } -std::function MapLongUShortPubSubType::getSerializedSizeProvider( +uint32_t MapLongUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongUShortPubSubType::createData() +void* MapLongUShortPubSubType::create_data() { return reinterpret_cast(new MapLongUShort()); } -void MapLongUShortPubSubType::deleteData( +void MapLongUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongUShortPubSubType::getKey( +bool MapLongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10414,35 +8694,27 @@ bool MapLongUShortPubSubType::getKey( const MapLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongUShort_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 || MapLongUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10455,26 +8727,21 @@ void MapLongUShortPubSubType::register_type_object_representation() MapLongLongPubSubType::MapLongLongPubSubType() { - setName("MapLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLong::getMaxCdrSerializedSize()); -#else - MapLongLong_max_cdr_typesize; -#endif + set_name("MapLongLong"); + uint32_t type_size = MapLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLong_max_key_cdr_typesize > 16 ? MapLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLong_max_key_cdr_typesize > 16 ? MapLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongPubSubType::~MapLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10492,12 +8759,10 @@ bool MapLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10512,11 +8777,7 @@ bool MapLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10533,11 +8794,7 @@ bool MapLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10554,52 +8811,43 @@ bool MapLongLongPubSubType::deserialize( return true; } -std::function MapLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongPubSubType::createData() +void* MapLongLongPubSubType::create_data() { return reinterpret_cast(new MapLongLong()); } -void MapLongLongPubSubType::deleteData( +void MapLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongPubSubType::getKey( +bool MapLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10607,35 +8855,27 @@ bool MapLongLongPubSubType::getKey( const MapLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLong_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 || MapLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10648,26 +8888,21 @@ void MapLongLongPubSubType::register_type_object_representation() MapLongULongPubSubType::MapLongULongPubSubType() { - setName("MapLongULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongULong::getMaxCdrSerializedSize()); -#else - MapLongULong_max_cdr_typesize; -#endif + set_name("MapLongULong"); + uint32_t type_size = MapLongULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongULong_max_key_cdr_typesize > 16 ? MapLongULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongULong_max_key_cdr_typesize > 16 ? MapLongULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongULongPubSubType::~MapLongULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10685,12 +8920,10 @@ bool MapLongULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10705,11 +8938,7 @@ bool MapLongULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10726,11 +8955,7 @@ bool MapLongULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10747,52 +8972,43 @@ bool MapLongULongPubSubType::deserialize( return true; } -std::function MapLongULongPubSubType::getSerializedSizeProvider( +uint32_t MapLongULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongULongPubSubType::createData() +void* MapLongULongPubSubType::create_data() { return reinterpret_cast(new MapLongULong()); } -void MapLongULongPubSubType::deleteData( +void MapLongULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongULongPubSubType::getKey( +bool MapLongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10800,35 +9016,27 @@ bool MapLongULongPubSubType::getKey( const MapLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongULong_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 || MapLongULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10841,26 +9049,21 @@ void MapLongULongPubSubType::register_type_object_representation() MapLongKeyLongLongValuePubSubType::MapLongKeyLongLongValuePubSubType() { - setName("MapLongKeyLongLongValue"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongKeyLongLongValue::getMaxCdrSerializedSize()); -#else - MapLongKeyLongLongValue_max_cdr_typesize; -#endif + set_name("MapLongKeyLongLongValue"); + uint32_t type_size = MapLongKeyLongLongValue_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongKeyLongLongValue_max_key_cdr_typesize > 16 ? MapLongKeyLongLongValue_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongKeyLongLongValue_max_key_cdr_typesize > 16 ? MapLongKeyLongLongValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongKeyLongLongValuePubSubType::~MapLongKeyLongLongValuePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10878,12 +9081,10 @@ bool MapLongKeyLongLongValuePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10898,11 +9099,7 @@ bool MapLongKeyLongLongValuePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10919,11 +9116,7 @@ bool MapLongKeyLongLongValuePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10940,52 +9133,43 @@ bool MapLongKeyLongLongValuePubSubType::deserialize( return true; } -std::function MapLongKeyLongLongValuePubSubType::getSerializedSizeProvider( +uint32_t MapLongKeyLongLongValuePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongKeyLongLongValuePubSubType::createData() +void* MapLongKeyLongLongValuePubSubType::create_data() { return reinterpret_cast(new MapLongKeyLongLongValue()); } -void MapLongKeyLongLongValuePubSubType::deleteData( +void MapLongKeyLongLongValuePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongKeyLongLongValuePubSubType::getKey( +bool MapLongKeyLongLongValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10993,35 +9177,27 @@ bool MapLongKeyLongLongValuePubSubType::getKey( const MapLongKeyLongLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongKeyLongLongValue_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 || MapLongKeyLongLongValue_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11034,26 +9210,21 @@ void MapLongKeyLongLongValuePubSubType::register_type_object_representation() MapLongULongLongPubSubType::MapLongULongLongPubSubType() { - setName("MapLongULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongULongLong::getMaxCdrSerializedSize()); -#else - MapLongULongLong_max_cdr_typesize; -#endif + set_name("MapLongULongLong"); + uint32_t type_size = MapLongULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongULongLong_max_key_cdr_typesize > 16 ? MapLongULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongULongLong_max_key_cdr_typesize > 16 ? MapLongULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongULongLongPubSubType::~MapLongULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11071,12 +9242,10 @@ bool MapLongULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11091,11 +9260,7 @@ bool MapLongULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11112,11 +9277,7 @@ bool MapLongULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11133,52 +9294,43 @@ bool MapLongULongLongPubSubType::deserialize( return true; } -std::function MapLongULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapLongULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongULongLongPubSubType::createData() +void* MapLongULongLongPubSubType::create_data() { return reinterpret_cast(new MapLongULongLong()); } -void MapLongULongLongPubSubType::deleteData( +void MapLongULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongULongLongPubSubType::getKey( +bool MapLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11186,35 +9338,27 @@ bool MapLongULongLongPubSubType::getKey( const MapLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongULongLong_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 || MapLongULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11227,26 +9371,21 @@ void MapLongULongLongPubSubType::register_type_object_representation() MapLongFloatPubSubType::MapLongFloatPubSubType() { - setName("MapLongFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongFloat::getMaxCdrSerializedSize()); -#else - MapLongFloat_max_cdr_typesize; -#endif + set_name("MapLongFloat"); + uint32_t type_size = MapLongFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongFloat_max_key_cdr_typesize > 16 ? MapLongFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongFloat_max_key_cdr_typesize > 16 ? MapLongFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongFloatPubSubType::~MapLongFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11264,12 +9403,10 @@ bool MapLongFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11284,11 +9421,7 @@ bool MapLongFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11305,11 +9438,7 @@ bool MapLongFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11326,52 +9455,43 @@ bool MapLongFloatPubSubType::deserialize( return true; } -std::function MapLongFloatPubSubType::getSerializedSizeProvider( +uint32_t MapLongFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongFloatPubSubType::createData() +void* MapLongFloatPubSubType::create_data() { return reinterpret_cast(new MapLongFloat()); } -void MapLongFloatPubSubType::deleteData( +void MapLongFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongFloatPubSubType::getKey( +bool MapLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11379,35 +9499,27 @@ bool MapLongFloatPubSubType::getKey( const MapLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongFloat_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 || MapLongFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11420,26 +9532,21 @@ void MapLongFloatPubSubType::register_type_object_representation() MapLongDoublePubSubType::MapLongDoublePubSubType() { - setName("MapLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongDouble::getMaxCdrSerializedSize()); -#else - MapLongDouble_max_cdr_typesize; -#endif + set_name("MapLongDouble"); + uint32_t type_size = MapLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongDouble_max_key_cdr_typesize > 16 ? MapLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongDouble_max_key_cdr_typesize > 16 ? MapLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongDoublePubSubType::~MapLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11457,12 +9564,10 @@ bool MapLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11477,11 +9582,7 @@ bool MapLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11498,11 +9599,7 @@ bool MapLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11519,52 +9616,43 @@ bool MapLongDoublePubSubType::deserialize( return true; } -std::function MapLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongDoublePubSubType::createData() +void* MapLongDoublePubSubType::create_data() { return reinterpret_cast(new MapLongDouble()); } -void MapLongDoublePubSubType::deleteData( +void MapLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongDoublePubSubType::getKey( +bool MapLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11572,35 +9660,27 @@ bool MapLongDoublePubSubType::getKey( const MapLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongDouble_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 || MapLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11613,26 +9693,21 @@ void MapLongDoublePubSubType::register_type_object_representation() MapLongKeyLongDoubleValuePubSubType::MapLongKeyLongDoubleValuePubSubType() { - setName("MapLongKeyLongDoubleValue"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongKeyLongDoubleValue::getMaxCdrSerializedSize()); -#else - MapLongKeyLongDoubleValue_max_cdr_typesize; -#endif + set_name("MapLongKeyLongDoubleValue"); + uint32_t type_size = MapLongKeyLongDoubleValue_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongKeyLongDoubleValue_max_key_cdr_typesize > 16 ? MapLongKeyLongDoubleValue_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongKeyLongDoubleValue_max_key_cdr_typesize > 16 ? MapLongKeyLongDoubleValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongKeyLongDoubleValuePubSubType::~MapLongKeyLongDoubleValuePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11650,12 +9725,10 @@ bool MapLongKeyLongDoubleValuePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11670,11 +9743,7 @@ bool MapLongKeyLongDoubleValuePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11691,11 +9760,7 @@ bool MapLongKeyLongDoubleValuePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11712,52 +9777,43 @@ bool MapLongKeyLongDoubleValuePubSubType::deserialize( return true; } -std::function MapLongKeyLongDoubleValuePubSubType::getSerializedSizeProvider( +uint32_t MapLongKeyLongDoubleValuePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongKeyLongDoubleValuePubSubType::createData() +void* MapLongKeyLongDoubleValuePubSubType::create_data() { return reinterpret_cast(new MapLongKeyLongDoubleValue()); } -void MapLongKeyLongDoubleValuePubSubType::deleteData( +void MapLongKeyLongDoubleValuePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongKeyLongDoubleValuePubSubType::getKey( +bool MapLongKeyLongDoubleValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11765,35 +9821,27 @@ bool MapLongKeyLongDoubleValuePubSubType::getKey( const MapLongKeyLongDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongKeyLongDoubleValue_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 || MapLongKeyLongDoubleValue_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11806,26 +9854,21 @@ void MapLongKeyLongDoubleValuePubSubType::register_type_object_representation() MapLongBooleanPubSubType::MapLongBooleanPubSubType() { - setName("MapLongBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongBoolean::getMaxCdrSerializedSize()); -#else - MapLongBoolean_max_cdr_typesize; -#endif + set_name("MapLongBoolean"); + uint32_t type_size = MapLongBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongBoolean_max_key_cdr_typesize > 16 ? MapLongBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongBoolean_max_key_cdr_typesize > 16 ? MapLongBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongBooleanPubSubType::~MapLongBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11843,12 +9886,10 @@ bool MapLongBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11863,11 +9904,7 @@ bool MapLongBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11884,11 +9921,7 @@ bool MapLongBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11905,52 +9938,43 @@ bool MapLongBooleanPubSubType::deserialize( return true; } -std::function MapLongBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapLongBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongBooleanPubSubType::createData() +void* MapLongBooleanPubSubType::create_data() { return reinterpret_cast(new MapLongBoolean()); } -void MapLongBooleanPubSubType::deleteData( +void MapLongBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongBooleanPubSubType::getKey( +bool MapLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11958,35 +9982,27 @@ bool MapLongBooleanPubSubType::getKey( const MapLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongBoolean_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 || MapLongBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11999,26 +10015,21 @@ void MapLongBooleanPubSubType::register_type_object_representation() MapLongOctetPubSubType::MapLongOctetPubSubType() { - setName("MapLongOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongOctet::getMaxCdrSerializedSize()); -#else - MapLongOctet_max_cdr_typesize; -#endif + set_name("MapLongOctet"); + uint32_t type_size = MapLongOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongOctet_max_key_cdr_typesize > 16 ? MapLongOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongOctet_max_key_cdr_typesize > 16 ? MapLongOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongOctetPubSubType::~MapLongOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12036,12 +10047,10 @@ bool MapLongOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12056,11 +10065,7 @@ bool MapLongOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12077,11 +10082,7 @@ bool MapLongOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12098,52 +10099,43 @@ bool MapLongOctetPubSubType::deserialize( return true; } -std::function MapLongOctetPubSubType::getSerializedSizeProvider( +uint32_t MapLongOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongOctetPubSubType::createData() +void* MapLongOctetPubSubType::create_data() { return reinterpret_cast(new MapLongOctet()); } -void MapLongOctetPubSubType::deleteData( +void MapLongOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongOctetPubSubType::getKey( +bool MapLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12151,35 +10143,27 @@ bool MapLongOctetPubSubType::getKey( const MapLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongOctet_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 || MapLongOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12192,26 +10176,21 @@ void MapLongOctetPubSubType::register_type_object_representation() MapLongCharPubSubType::MapLongCharPubSubType() { - setName("MapLongChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongChar::getMaxCdrSerializedSize()); -#else - MapLongChar_max_cdr_typesize; -#endif + set_name("MapLongChar"); + uint32_t type_size = MapLongChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongChar_max_key_cdr_typesize > 16 ? MapLongChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongChar_max_key_cdr_typesize > 16 ? MapLongChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongCharPubSubType::~MapLongCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12229,12 +10208,10 @@ bool MapLongCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12249,11 +10226,7 @@ bool MapLongCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12270,11 +10243,7 @@ bool MapLongCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12291,52 +10260,43 @@ bool MapLongCharPubSubType::deserialize( return true; } -std::function MapLongCharPubSubType::getSerializedSizeProvider( +uint32_t MapLongCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongCharPubSubType::createData() +void* MapLongCharPubSubType::create_data() { return reinterpret_cast(new MapLongChar()); } -void MapLongCharPubSubType::deleteData( +void MapLongCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongCharPubSubType::getKey( +bool MapLongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12344,35 +10304,27 @@ bool MapLongCharPubSubType::getKey( const MapLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongChar_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 || MapLongChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12385,26 +10337,21 @@ void MapLongCharPubSubType::register_type_object_representation() MapLongWCharPubSubType::MapLongWCharPubSubType() { - setName("MapLongWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongWChar::getMaxCdrSerializedSize()); -#else - MapLongWChar_max_cdr_typesize; -#endif + set_name("MapLongWChar"); + uint32_t type_size = MapLongWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongWChar_max_key_cdr_typesize > 16 ? MapLongWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongWChar_max_key_cdr_typesize > 16 ? MapLongWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongWCharPubSubType::~MapLongWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12422,12 +10369,10 @@ bool MapLongWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12442,11 +10387,7 @@ bool MapLongWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12463,11 +10404,7 @@ bool MapLongWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12484,52 +10421,43 @@ bool MapLongWCharPubSubType::deserialize( return true; } -std::function MapLongWCharPubSubType::getSerializedSizeProvider( +uint32_t MapLongWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongWCharPubSubType::createData() +void* MapLongWCharPubSubType::create_data() { return reinterpret_cast(new MapLongWChar()); } -void MapLongWCharPubSubType::deleteData( +void MapLongWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongWCharPubSubType::getKey( +bool MapLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12537,35 +10465,27 @@ bool MapLongWCharPubSubType::getKey( const MapLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongWChar_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 || MapLongWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12578,26 +10498,21 @@ void MapLongWCharPubSubType::register_type_object_representation() MapLongStringPubSubType::MapLongStringPubSubType() { - setName("MapLongString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongString::getMaxCdrSerializedSize()); -#else - MapLongString_max_cdr_typesize; -#endif + set_name("MapLongString"); + uint32_t type_size = MapLongString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongString_max_key_cdr_typesize > 16 ? MapLongString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongString_max_key_cdr_typesize > 16 ? MapLongString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongStringPubSubType::~MapLongStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12615,12 +10530,10 @@ bool MapLongStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12635,11 +10548,7 @@ bool MapLongStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12656,11 +10565,7 @@ bool MapLongStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12677,52 +10582,43 @@ bool MapLongStringPubSubType::deserialize( return true; } -std::function MapLongStringPubSubType::getSerializedSizeProvider( +uint32_t MapLongStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongStringPubSubType::createData() +void* MapLongStringPubSubType::create_data() { return reinterpret_cast(new MapLongString()); } -void MapLongStringPubSubType::deleteData( +void MapLongStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongStringPubSubType::getKey( +bool MapLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12730,35 +10626,27 @@ bool MapLongStringPubSubType::getKey( const MapLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongString_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 || MapLongString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12771,26 +10659,21 @@ void MapLongStringPubSubType::register_type_object_representation() MapLongWStringPubSubType::MapLongWStringPubSubType() { - setName("MapLongWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongWString::getMaxCdrSerializedSize()); -#else - MapLongWString_max_cdr_typesize; -#endif + set_name("MapLongWString"); + uint32_t type_size = MapLongWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongWString_max_key_cdr_typesize > 16 ? MapLongWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongWString_max_key_cdr_typesize > 16 ? MapLongWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongWStringPubSubType::~MapLongWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12808,12 +10691,10 @@ bool MapLongWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12828,11 +10709,7 @@ bool MapLongWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12849,11 +10726,7 @@ bool MapLongWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12870,52 +10743,43 @@ bool MapLongWStringPubSubType::deserialize( return true; } -std::function MapLongWStringPubSubType::getSerializedSizeProvider( +uint32_t MapLongWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongWStringPubSubType::createData() +void* MapLongWStringPubSubType::create_data() { return reinterpret_cast(new MapLongWString()); } -void MapLongWStringPubSubType::deleteData( +void MapLongWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongWStringPubSubType::getKey( +bool MapLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12923,35 +10787,27 @@ bool MapLongWStringPubSubType::getKey( const MapLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongWString_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 || MapLongWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12964,26 +10820,21 @@ void MapLongWStringPubSubType::register_type_object_representation() MapLongInnerAliasBoundedStringHelperPubSubType::MapLongInnerAliasBoundedStringHelperPubSubType() { - setName("MapLongInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasBoundedStringHelper"); + uint32_t type_size = MapLongInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasBoundedStringHelperPubSubType::~MapLongInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13001,12 +10852,10 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13021,11 +10870,7 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13042,11 +10887,7 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13063,52 +10904,43 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasBoundedStringHelperPubSubType::createData() +void* MapLongInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasBoundedStringHelper()); } -void MapLongInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapLongInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13116,35 +10948,27 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::getKey( const MapLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasBoundedStringHelper_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 || MapLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13157,26 +10981,21 @@ void MapLongInnerAliasBoundedStringHelperPubSubType::register_type_object_repres MapLongInnerAliasBoundedWStringHelperPubSubType::MapLongInnerAliasBoundedWStringHelperPubSubType() { - setName("MapLongInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapLongInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasBoundedWStringHelperPubSubType::~MapLongInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13194,12 +11013,10 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13214,11 +11031,7 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13235,11 +11048,7 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13256,52 +11065,43 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapLongInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasBoundedWStringHelper()); } -void MapLongInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapLongInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13309,35 +11109,27 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::getKey( const MapLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasBoundedWStringHelper_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 || MapLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13350,26 +11142,21 @@ void MapLongInnerAliasBoundedWStringHelperPubSubType::register_type_object_repre MapLongInnerEnumHelperPubSubType::MapLongInnerEnumHelperPubSubType() { - setName("MapLongInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerEnumHelper"); + uint32_t type_size = MapLongInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapLongInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapLongInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerEnumHelperPubSubType::~MapLongInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13387,12 +11174,10 @@ bool MapLongInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13407,11 +11192,7 @@ bool MapLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13428,11 +11209,7 @@ bool MapLongInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13449,52 +11226,43 @@ bool MapLongInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapLongInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerEnumHelperPubSubType::createData() +void* MapLongInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerEnumHelper()); } -void MapLongInnerEnumHelperPubSubType::deleteData( +void MapLongInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerEnumHelperPubSubType::getKey( +bool MapLongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13502,35 +11270,27 @@ bool MapLongInnerEnumHelperPubSubType::getKey( const MapLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerEnumHelper_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 || MapLongInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13543,26 +11303,21 @@ void MapLongInnerEnumHelperPubSubType::register_type_object_representation() MapLongInnerBitMaskHelperPubSubType::MapLongInnerBitMaskHelperPubSubType() { - setName("MapLongInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerBitMaskHelper"); + uint32_t type_size = MapLongInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerBitMaskHelperPubSubType::~MapLongInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13580,12 +11335,10 @@ bool MapLongInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13600,11 +11353,7 @@ bool MapLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13621,11 +11370,7 @@ bool MapLongInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13642,52 +11387,43 @@ bool MapLongInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapLongInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerBitMaskHelperPubSubType::createData() +void* MapLongInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerBitMaskHelper()); } -void MapLongInnerBitMaskHelperPubSubType::deleteData( +void MapLongInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerBitMaskHelperPubSubType::getKey( +bool MapLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13695,35 +11431,27 @@ bool MapLongInnerBitMaskHelperPubSubType::getKey( const MapLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerBitMaskHelper_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 || MapLongInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13736,26 +11464,21 @@ void MapLongInnerBitMaskHelperPubSubType::register_type_object_representation() MapLongInnerAliasHelperPubSubType::MapLongInnerAliasHelperPubSubType() { - setName("MapLongInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasHelper"); + uint32_t type_size = MapLongInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasHelperPubSubType::~MapLongInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13773,12 +11496,10 @@ bool MapLongInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13793,11 +11514,7 @@ bool MapLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13814,11 +11531,7 @@ bool MapLongInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13835,52 +11548,43 @@ bool MapLongInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasHelperPubSubType::createData() +void* MapLongInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasHelper()); } -void MapLongInnerAliasHelperPubSubType::deleteData( +void MapLongInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasHelperPubSubType::getKey( +bool MapLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13888,35 +11592,27 @@ bool MapLongInnerAliasHelperPubSubType::getKey( const MapLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasHelper_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 || MapLongInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13929,26 +11625,21 @@ void MapLongInnerAliasHelperPubSubType::register_type_object_representation() MapLongInnerAliasArrayHelperPubSubType::MapLongInnerAliasArrayHelperPubSubType() { - setName("MapLongInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasArrayHelper"); + uint32_t type_size = MapLongInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasArrayHelperPubSubType::~MapLongInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13966,12 +11657,10 @@ bool MapLongInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13986,11 +11675,7 @@ bool MapLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14007,11 +11692,7 @@ bool MapLongInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14028,52 +11709,43 @@ bool MapLongInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasArrayHelperPubSubType::createData() +void* MapLongInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasArrayHelper()); } -void MapLongInnerAliasArrayHelperPubSubType::deleteData( +void MapLongInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasArrayHelperPubSubType::getKey( +bool MapLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14081,35 +11753,27 @@ bool MapLongInnerAliasArrayHelperPubSubType::getKey( const MapLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasArrayHelper_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 || MapLongInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14122,26 +11786,21 @@ void MapLongInnerAliasArrayHelperPubSubType::register_type_object_representation MapLongInnerAliasSequenceHelperPubSubType::MapLongInnerAliasSequenceHelperPubSubType() { - setName("MapLongInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasSequenceHelper"); + uint32_t type_size = MapLongInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasSequenceHelperPubSubType::~MapLongInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14159,12 +11818,10 @@ bool MapLongInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14179,11 +11836,7 @@ bool MapLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14200,11 +11853,7 @@ bool MapLongInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14221,52 +11870,43 @@ bool MapLongInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasSequenceHelperPubSubType::createData() +void* MapLongInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasSequenceHelper()); } -void MapLongInnerAliasSequenceHelperPubSubType::deleteData( +void MapLongInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasSequenceHelperPubSubType::getKey( +bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14274,35 +11914,27 @@ bool MapLongInnerAliasSequenceHelperPubSubType::getKey( const MapLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasSequenceHelper_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 || MapLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14315,26 +11947,21 @@ void MapLongInnerAliasSequenceHelperPubSubType::register_type_object_representat MapLongInnerAliasMapHelperPubSubType::MapLongInnerAliasMapHelperPubSubType() { - setName("MapLongInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerAliasMapHelper"); + uint32_t type_size = MapLongInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapLongInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerAliasMapHelperPubSubType::~MapLongInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14352,12 +11979,10 @@ bool MapLongInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14372,11 +11997,7 @@ bool MapLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14393,11 +12014,7 @@ bool MapLongInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14414,52 +12031,43 @@ bool MapLongInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapLongInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerAliasMapHelperPubSubType::createData() +void* MapLongInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerAliasMapHelper()); } -void MapLongInnerAliasMapHelperPubSubType::deleteData( +void MapLongInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerAliasMapHelperPubSubType::getKey( +bool MapLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14467,35 +12075,27 @@ bool MapLongInnerAliasMapHelperPubSubType::getKey( const MapLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerAliasMapHelper_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 || MapLongInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14508,26 +12108,21 @@ void MapLongInnerAliasMapHelperPubSubType::register_type_object_representation() MapLongInnerUnionHelperPubSubType::MapLongInnerUnionHelperPubSubType() { - setName("MapLongInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerUnionHelper"); + uint32_t type_size = MapLongInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapLongInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapLongInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerUnionHelperPubSubType::~MapLongInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14545,12 +12140,10 @@ bool MapLongInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14565,11 +12158,7 @@ bool MapLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14586,11 +12175,7 @@ bool MapLongInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14607,52 +12192,43 @@ bool MapLongInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapLongInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerUnionHelperPubSubType::createData() +void* MapLongInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerUnionHelper()); } -void MapLongInnerUnionHelperPubSubType::deleteData( +void MapLongInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerUnionHelperPubSubType::getKey( +bool MapLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14660,35 +12236,27 @@ bool MapLongInnerUnionHelperPubSubType::getKey( const MapLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerUnionHelper_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 || MapLongInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14701,26 +12269,21 @@ void MapLongInnerUnionHelperPubSubType::register_type_object_representation() MapLongInnerStructureHelperPubSubType::MapLongInnerStructureHelperPubSubType() { - setName("MapLongInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerStructureHelper"); + uint32_t type_size = MapLongInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapLongInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapLongInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerStructureHelperPubSubType::~MapLongInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14738,12 +12301,10 @@ bool MapLongInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14758,11 +12319,7 @@ bool MapLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14779,11 +12336,7 @@ bool MapLongInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14800,52 +12353,43 @@ bool MapLongInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapLongInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerStructureHelperPubSubType::createData() +void* MapLongInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerStructureHelper()); } -void MapLongInnerStructureHelperPubSubType::deleteData( +void MapLongInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerStructureHelperPubSubType::getKey( +bool MapLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14853,35 +12397,27 @@ bool MapLongInnerStructureHelperPubSubType::getKey( const MapLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerStructureHelper_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 || MapLongInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14894,26 +12430,21 @@ void MapLongInnerStructureHelperPubSubType::register_type_object_representation( MapLongInnerBitsetHelperPubSubType::MapLongInnerBitsetHelperPubSubType() { - setName("MapLongInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapLongInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapLongInnerBitsetHelper"); + uint32_t type_size = MapLongInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongInnerBitsetHelperPubSubType::~MapLongInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14931,12 +12462,10 @@ bool MapLongInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14951,11 +12480,7 @@ bool MapLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14972,11 +12497,7 @@ bool MapLongInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14993,52 +12514,43 @@ bool MapLongInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapLongInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongInnerBitsetHelperPubSubType::createData() +void* MapLongInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapLongInnerBitsetHelper()); } -void MapLongInnerBitsetHelperPubSubType::deleteData( +void MapLongInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongInnerBitsetHelperPubSubType::getKey( +bool MapLongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15046,35 +12558,27 @@ bool MapLongInnerBitsetHelperPubSubType::getKey( const MapLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongInnerBitsetHelper_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 || MapLongInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15087,26 +12591,21 @@ void MapLongInnerBitsetHelperPubSubType::register_type_object_representation() MapULongShortPubSubType::MapULongShortPubSubType() { - setName("MapULongShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongShort::getMaxCdrSerializedSize()); -#else - MapULongShort_max_cdr_typesize; -#endif + set_name("MapULongShort"); + uint32_t type_size = MapULongShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongShort_max_key_cdr_typesize > 16 ? MapULongShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongShort_max_key_cdr_typesize > 16 ? MapULongShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongShortPubSubType::~MapULongShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15124,12 +12623,10 @@ bool MapULongShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15144,11 +12641,7 @@ bool MapULongShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15165,11 +12658,7 @@ bool MapULongShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15186,52 +12675,43 @@ bool MapULongShortPubSubType::deserialize( return true; } -std::function MapULongShortPubSubType::getSerializedSizeProvider( +uint32_t MapULongShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongShortPubSubType::createData() +void* MapULongShortPubSubType::create_data() { return reinterpret_cast(new MapULongShort()); } -void MapULongShortPubSubType::deleteData( +void MapULongShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongShortPubSubType::getKey( +bool MapULongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15239,35 +12719,27 @@ bool MapULongShortPubSubType::getKey( const MapULongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongShort_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 || MapULongShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15280,26 +12752,21 @@ void MapULongShortPubSubType::register_type_object_representation() MapULongUShortPubSubType::MapULongUShortPubSubType() { - setName("MapULongUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongUShort::getMaxCdrSerializedSize()); -#else - MapULongUShort_max_cdr_typesize; -#endif + set_name("MapULongUShort"); + uint32_t type_size = MapULongUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongUShort_max_key_cdr_typesize > 16 ? MapULongUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongUShort_max_key_cdr_typesize > 16 ? MapULongUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongUShortPubSubType::~MapULongUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15317,12 +12784,10 @@ bool MapULongUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15337,11 +12802,7 @@ bool MapULongUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15358,11 +12819,7 @@ bool MapULongUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15379,52 +12836,43 @@ bool MapULongUShortPubSubType::deserialize( return true; } -std::function MapULongUShortPubSubType::getSerializedSizeProvider( +uint32_t MapULongUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongUShortPubSubType::createData() +void* MapULongUShortPubSubType::create_data() { return reinterpret_cast(new MapULongUShort()); } -void MapULongUShortPubSubType::deleteData( +void MapULongUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongUShortPubSubType::getKey( +bool MapULongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15432,35 +12880,27 @@ bool MapULongUShortPubSubType::getKey( const MapULongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongUShort_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 || MapULongUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15473,26 +12913,21 @@ void MapULongUShortPubSubType::register_type_object_representation() MapULongLongPubSubType::MapULongLongPubSubType() { - setName("MapULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLong::getMaxCdrSerializedSize()); -#else - MapULongLong_max_cdr_typesize; -#endif + set_name("MapULongLong"); + uint32_t type_size = MapULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLong_max_key_cdr_typesize > 16 ? MapULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLong_max_key_cdr_typesize > 16 ? MapULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongPubSubType::~MapULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15510,12 +12945,10 @@ bool MapULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15530,11 +12963,7 @@ bool MapULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15551,11 +12980,7 @@ bool MapULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15572,52 +12997,43 @@ bool MapULongLongPubSubType::deserialize( return true; } -std::function MapULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongPubSubType::createData() +void* MapULongLongPubSubType::create_data() { return reinterpret_cast(new MapULongLong()); } -void MapULongLongPubSubType::deleteData( +void MapULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongPubSubType::getKey( +bool MapULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15625,35 +13041,27 @@ bool MapULongLongPubSubType::getKey( const MapULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLong_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 || MapULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15666,26 +13074,21 @@ void MapULongLongPubSubType::register_type_object_representation() MapULongULongPubSubType::MapULongULongPubSubType() { - setName("MapULongULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongULong::getMaxCdrSerializedSize()); -#else - MapULongULong_max_cdr_typesize; -#endif + set_name("MapULongULong"); + uint32_t type_size = MapULongULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongULong_max_key_cdr_typesize > 16 ? MapULongULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongULong_max_key_cdr_typesize > 16 ? MapULongULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongULongPubSubType::~MapULongULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15703,12 +13106,10 @@ bool MapULongULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15723,11 +13124,7 @@ bool MapULongULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15744,11 +13141,7 @@ bool MapULongULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15765,52 +13158,43 @@ bool MapULongULongPubSubType::deserialize( return true; } -std::function MapULongULongPubSubType::getSerializedSizeProvider( +uint32_t MapULongULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongULongPubSubType::createData() +void* MapULongULongPubSubType::create_data() { return reinterpret_cast(new MapULongULong()); } -void MapULongULongPubSubType::deleteData( +void MapULongULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongULongPubSubType::getKey( +bool MapULongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15818,35 +13202,27 @@ bool MapULongULongPubSubType::getKey( const MapULongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongULong_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 || MapULongULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15859,26 +13235,21 @@ void MapULongULongPubSubType::register_type_object_representation() MapKeyULongValueLongLongPubSubType::MapKeyULongValueLongLongPubSubType() { - setName("MapKeyULongValueLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapKeyULongValueLongLong::getMaxCdrSerializedSize()); -#else - MapKeyULongValueLongLong_max_cdr_typesize; -#endif + set_name("MapKeyULongValueLongLong"); + uint32_t type_size = MapKeyULongValueLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapKeyULongValueLongLong_max_key_cdr_typesize > 16 ? MapKeyULongValueLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapKeyULongValueLongLong_max_key_cdr_typesize > 16 ? MapKeyULongValueLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapKeyULongValueLongLongPubSubType::~MapKeyULongValueLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15896,12 +13267,10 @@ bool MapKeyULongValueLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15916,11 +13285,7 @@ bool MapKeyULongValueLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15937,11 +13302,7 @@ bool MapKeyULongValueLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15958,52 +13319,43 @@ bool MapKeyULongValueLongLongPubSubType::deserialize( return true; } -std::function MapKeyULongValueLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapKeyULongValueLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapKeyULongValueLongLongPubSubType::createData() +void* MapKeyULongValueLongLongPubSubType::create_data() { return reinterpret_cast(new MapKeyULongValueLongLong()); } -void MapKeyULongValueLongLongPubSubType::deleteData( +void MapKeyULongValueLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapKeyULongValueLongLongPubSubType::getKey( +bool MapKeyULongValueLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16011,35 +13363,27 @@ bool MapKeyULongValueLongLongPubSubType::getKey( const MapKeyULongValueLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapKeyULongValueLongLong_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 || MapKeyULongValueLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16052,26 +13396,21 @@ void MapKeyULongValueLongLongPubSubType::register_type_object_representation() MapULongULongLongPubSubType::MapULongULongLongPubSubType() { - setName("MapULongULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongULongLong::getMaxCdrSerializedSize()); -#else - MapULongULongLong_max_cdr_typesize; -#endif + set_name("MapULongULongLong"); + uint32_t type_size = MapULongULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongULongLong_max_key_cdr_typesize > 16 ? MapULongULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongULongLong_max_key_cdr_typesize > 16 ? MapULongULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongULongLongPubSubType::~MapULongULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16089,12 +13428,10 @@ bool MapULongULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16109,11 +13446,7 @@ bool MapULongULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16130,11 +13463,7 @@ bool MapULongULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16151,52 +13480,43 @@ bool MapULongULongLongPubSubType::deserialize( return true; } -std::function MapULongULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapULongULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongULongLongPubSubType::createData() +void* MapULongULongLongPubSubType::create_data() { return reinterpret_cast(new MapULongULongLong()); } -void MapULongULongLongPubSubType::deleteData( +void MapULongULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongULongLongPubSubType::getKey( +bool MapULongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16204,35 +13524,27 @@ bool MapULongULongLongPubSubType::getKey( const MapULongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongULongLong_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 || MapULongULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16245,26 +13557,21 @@ void MapULongULongLongPubSubType::register_type_object_representation() MapULongFloatPubSubType::MapULongFloatPubSubType() { - setName("MapULongFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongFloat::getMaxCdrSerializedSize()); -#else - MapULongFloat_max_cdr_typesize; -#endif + set_name("MapULongFloat"); + uint32_t type_size = MapULongFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongFloat_max_key_cdr_typesize > 16 ? MapULongFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongFloat_max_key_cdr_typesize > 16 ? MapULongFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongFloatPubSubType::~MapULongFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16282,12 +13589,10 @@ bool MapULongFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16302,11 +13607,7 @@ bool MapULongFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16323,11 +13624,7 @@ bool MapULongFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16344,52 +13641,43 @@ bool MapULongFloatPubSubType::deserialize( return true; } -std::function MapULongFloatPubSubType::getSerializedSizeProvider( +uint32_t MapULongFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongFloatPubSubType::createData() +void* MapULongFloatPubSubType::create_data() { return reinterpret_cast(new MapULongFloat()); } -void MapULongFloatPubSubType::deleteData( +void MapULongFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongFloatPubSubType::getKey( +bool MapULongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16397,35 +13685,27 @@ bool MapULongFloatPubSubType::getKey( const MapULongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongFloat_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 || MapULongFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16438,26 +13718,21 @@ void MapULongFloatPubSubType::register_type_object_representation() MapULongDoublePubSubType::MapULongDoublePubSubType() { - setName("MapULongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongDouble::getMaxCdrSerializedSize()); -#else - MapULongDouble_max_cdr_typesize; -#endif + set_name("MapULongDouble"); + uint32_t type_size = MapULongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongDouble_max_key_cdr_typesize > 16 ? MapULongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongDouble_max_key_cdr_typesize > 16 ? MapULongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongDoublePubSubType::~MapULongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16475,12 +13750,10 @@ bool MapULongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16495,11 +13768,7 @@ bool MapULongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16516,11 +13785,7 @@ bool MapULongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16537,52 +13802,43 @@ bool MapULongDoublePubSubType::deserialize( return true; } -std::function MapULongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapULongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongDoublePubSubType::createData() +void* MapULongDoublePubSubType::create_data() { return reinterpret_cast(new MapULongDouble()); } -void MapULongDoublePubSubType::deleteData( +void MapULongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongDoublePubSubType::getKey( +bool MapULongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16590,35 +13846,27 @@ bool MapULongDoublePubSubType::getKey( const MapULongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongDouble_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 || MapULongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16631,26 +13879,21 @@ void MapULongDoublePubSubType::register_type_object_representation() MapKeyULongValueLongDoublePubSubType::MapKeyULongValueLongDoublePubSubType() { - setName("MapKeyULongValueLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapKeyULongValueLongDouble::getMaxCdrSerializedSize()); -#else - MapKeyULongValueLongDouble_max_cdr_typesize; -#endif + set_name("MapKeyULongValueLongDouble"); + uint32_t type_size = MapKeyULongValueLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapKeyULongValueLongDouble_max_key_cdr_typesize > 16 ? MapKeyULongValueLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapKeyULongValueLongDouble_max_key_cdr_typesize > 16 ? MapKeyULongValueLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapKeyULongValueLongDoublePubSubType::~MapKeyULongValueLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16668,12 +13911,10 @@ bool MapKeyULongValueLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16688,11 +13929,7 @@ bool MapKeyULongValueLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16709,11 +13946,7 @@ bool MapKeyULongValueLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16730,52 +13963,43 @@ bool MapKeyULongValueLongDoublePubSubType::deserialize( return true; } -std::function MapKeyULongValueLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapKeyULongValueLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapKeyULongValueLongDoublePubSubType::createData() +void* MapKeyULongValueLongDoublePubSubType::create_data() { return reinterpret_cast(new MapKeyULongValueLongDouble()); } -void MapKeyULongValueLongDoublePubSubType::deleteData( +void MapKeyULongValueLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapKeyULongValueLongDoublePubSubType::getKey( +bool MapKeyULongValueLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16783,35 +14007,27 @@ bool MapKeyULongValueLongDoublePubSubType::getKey( const MapKeyULongValueLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapKeyULongValueLongDouble_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 || MapKeyULongValueLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -16824,26 +14040,21 @@ void MapKeyULongValueLongDoublePubSubType::register_type_object_representation() MapULongBooleanPubSubType::MapULongBooleanPubSubType() { - setName("MapULongBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongBoolean::getMaxCdrSerializedSize()); -#else - MapULongBoolean_max_cdr_typesize; -#endif + set_name("MapULongBoolean"); + uint32_t type_size = MapULongBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongBoolean_max_key_cdr_typesize > 16 ? MapULongBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongBoolean_max_key_cdr_typesize > 16 ? MapULongBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongBooleanPubSubType::~MapULongBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -16861,12 +14072,10 @@ bool MapULongBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -16881,11 +14090,7 @@ bool MapULongBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -16902,11 +14107,7 @@ bool MapULongBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -16923,52 +14124,43 @@ bool MapULongBooleanPubSubType::deserialize( return true; } -std::function MapULongBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapULongBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongBooleanPubSubType::createData() +void* MapULongBooleanPubSubType::create_data() { return reinterpret_cast(new MapULongBoolean()); } -void MapULongBooleanPubSubType::deleteData( +void MapULongBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongBooleanPubSubType::getKey( +bool MapULongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -16976,35 +14168,27 @@ bool MapULongBooleanPubSubType::getKey( const MapULongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongBoolean_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 || MapULongBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17017,26 +14201,21 @@ void MapULongBooleanPubSubType::register_type_object_representation() MapULongOctetPubSubType::MapULongOctetPubSubType() { - setName("MapULongOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongOctet::getMaxCdrSerializedSize()); -#else - MapULongOctet_max_cdr_typesize; -#endif + set_name("MapULongOctet"); + uint32_t type_size = MapULongOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongOctet_max_key_cdr_typesize > 16 ? MapULongOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongOctet_max_key_cdr_typesize > 16 ? MapULongOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongOctetPubSubType::~MapULongOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17054,12 +14233,10 @@ bool MapULongOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17074,11 +14251,7 @@ bool MapULongOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17095,11 +14268,7 @@ bool MapULongOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17116,52 +14285,43 @@ bool MapULongOctetPubSubType::deserialize( return true; } -std::function MapULongOctetPubSubType::getSerializedSizeProvider( +uint32_t MapULongOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongOctetPubSubType::createData() +void* MapULongOctetPubSubType::create_data() { return reinterpret_cast(new MapULongOctet()); } -void MapULongOctetPubSubType::deleteData( +void MapULongOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongOctetPubSubType::getKey( +bool MapULongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17169,35 +14329,27 @@ bool MapULongOctetPubSubType::getKey( const MapULongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongOctet_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 || MapULongOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17210,26 +14362,21 @@ void MapULongOctetPubSubType::register_type_object_representation() MapULongCharPubSubType::MapULongCharPubSubType() { - setName("MapULongChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongChar::getMaxCdrSerializedSize()); -#else - MapULongChar_max_cdr_typesize; -#endif + set_name("MapULongChar"); + uint32_t type_size = MapULongChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongChar_max_key_cdr_typesize > 16 ? MapULongChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongChar_max_key_cdr_typesize > 16 ? MapULongChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongCharPubSubType::~MapULongCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17247,12 +14394,10 @@ bool MapULongCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17267,11 +14412,7 @@ bool MapULongCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17288,11 +14429,7 @@ bool MapULongCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17309,52 +14446,43 @@ bool MapULongCharPubSubType::deserialize( return true; } -std::function MapULongCharPubSubType::getSerializedSizeProvider( +uint32_t MapULongCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongCharPubSubType::createData() +void* MapULongCharPubSubType::create_data() { return reinterpret_cast(new MapULongChar()); } -void MapULongCharPubSubType::deleteData( +void MapULongCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongCharPubSubType::getKey( +bool MapULongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17362,35 +14490,27 @@ bool MapULongCharPubSubType::getKey( const MapULongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongChar_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 || MapULongChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17403,26 +14523,21 @@ void MapULongCharPubSubType::register_type_object_representation() MapULongWCharPubSubType::MapULongWCharPubSubType() { - setName("MapULongWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongWChar::getMaxCdrSerializedSize()); -#else - MapULongWChar_max_cdr_typesize; -#endif + set_name("MapULongWChar"); + uint32_t type_size = MapULongWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongWChar_max_key_cdr_typesize > 16 ? MapULongWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongWChar_max_key_cdr_typesize > 16 ? MapULongWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongWCharPubSubType::~MapULongWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17440,12 +14555,10 @@ bool MapULongWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17460,11 +14573,7 @@ bool MapULongWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17481,11 +14590,7 @@ bool MapULongWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17502,52 +14607,43 @@ bool MapULongWCharPubSubType::deserialize( return true; } -std::function MapULongWCharPubSubType::getSerializedSizeProvider( +uint32_t MapULongWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongWCharPubSubType::createData() +void* MapULongWCharPubSubType::create_data() { return reinterpret_cast(new MapULongWChar()); } -void MapULongWCharPubSubType::deleteData( +void MapULongWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongWCharPubSubType::getKey( +bool MapULongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17555,35 +14651,27 @@ bool MapULongWCharPubSubType::getKey( const MapULongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongWChar_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 || MapULongWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17596,26 +14684,21 @@ void MapULongWCharPubSubType::register_type_object_representation() MapULongStringPubSubType::MapULongStringPubSubType() { - setName("MapULongString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongString::getMaxCdrSerializedSize()); -#else - MapULongString_max_cdr_typesize; -#endif + set_name("MapULongString"); + uint32_t type_size = MapULongString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongString_max_key_cdr_typesize > 16 ? MapULongString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongString_max_key_cdr_typesize > 16 ? MapULongString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongStringPubSubType::~MapULongStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17633,12 +14716,10 @@ bool MapULongStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17653,11 +14734,7 @@ bool MapULongStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17674,11 +14751,7 @@ bool MapULongStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17695,52 +14768,43 @@ bool MapULongStringPubSubType::deserialize( return true; } -std::function MapULongStringPubSubType::getSerializedSizeProvider( +uint32_t MapULongStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongStringPubSubType::createData() +void* MapULongStringPubSubType::create_data() { return reinterpret_cast(new MapULongString()); } -void MapULongStringPubSubType::deleteData( +void MapULongStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongStringPubSubType::getKey( +bool MapULongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17748,35 +14812,27 @@ bool MapULongStringPubSubType::getKey( const MapULongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongString_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 || MapULongString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17789,26 +14845,21 @@ void MapULongStringPubSubType::register_type_object_representation() MapULongWStringPubSubType::MapULongWStringPubSubType() { - setName("MapULongWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongWString::getMaxCdrSerializedSize()); -#else - MapULongWString_max_cdr_typesize; -#endif + set_name("MapULongWString"); + uint32_t type_size = MapULongWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongWString_max_key_cdr_typesize > 16 ? MapULongWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongWString_max_key_cdr_typesize > 16 ? MapULongWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongWStringPubSubType::~MapULongWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -17826,12 +14877,10 @@ bool MapULongWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -17846,11 +14895,7 @@ bool MapULongWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -17867,11 +14912,7 @@ bool MapULongWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -17888,52 +14929,43 @@ bool MapULongWStringPubSubType::deserialize( return true; } -std::function MapULongWStringPubSubType::getSerializedSizeProvider( +uint32_t MapULongWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongWStringPubSubType::createData() +void* MapULongWStringPubSubType::create_data() { return reinterpret_cast(new MapULongWString()); } -void MapULongWStringPubSubType::deleteData( +void MapULongWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongWStringPubSubType::getKey( +bool MapULongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -17941,35 +14973,27 @@ bool MapULongWStringPubSubType::getKey( const MapULongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongWString_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 || MapULongWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -17982,26 +15006,21 @@ void MapULongWStringPubSubType::register_type_object_representation() MapULongInnerAliasBoundedStringHelperPubSubType::MapULongInnerAliasBoundedStringHelperPubSubType() { - setName("MapULongInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasBoundedStringHelper"); + uint32_t type_size = MapULongInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasBoundedStringHelperPubSubType::~MapULongInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18019,12 +15038,10 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18039,11 +15056,7 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18060,11 +15073,7 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18081,52 +15090,43 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasBoundedStringHelperPubSubType::createData() +void* MapULongInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasBoundedStringHelper()); } -void MapULongInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapULongInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18134,35 +15134,27 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::getKey( const MapULongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasBoundedStringHelper_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 || MapULongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18175,26 +15167,21 @@ void MapULongInnerAliasBoundedStringHelperPubSubType::register_type_object_repre MapULongInnerAliasBoundedWStringHelperPubSubType::MapULongInnerAliasBoundedWStringHelperPubSubType() { - setName("MapULongInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapULongInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasBoundedWStringHelperPubSubType::~MapULongInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18212,12 +15199,10 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18232,11 +15217,7 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18253,11 +15234,7 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18274,52 +15251,43 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapULongInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasBoundedWStringHelper()); } -void MapULongInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapULongInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18327,35 +15295,27 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::getKey( const MapULongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasBoundedWStringHelper_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 || MapULongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18368,26 +15328,21 @@ void MapULongInnerAliasBoundedWStringHelperPubSubType::register_type_object_repr MapULongInnerEnumHelperPubSubType::MapULongInnerEnumHelperPubSubType() { - setName("MapULongInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerEnumHelper"); + uint32_t type_size = MapULongInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerEnumHelperPubSubType::~MapULongInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18405,12 +15360,10 @@ bool MapULongInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18425,11 +15378,7 @@ bool MapULongInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18446,11 +15395,7 @@ bool MapULongInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18467,52 +15412,43 @@ bool MapULongInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapULongInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerEnumHelperPubSubType::createData() +void* MapULongInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerEnumHelper()); } -void MapULongInnerEnumHelperPubSubType::deleteData( +void MapULongInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerEnumHelperPubSubType::getKey( +bool MapULongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18520,35 +15456,27 @@ bool MapULongInnerEnumHelperPubSubType::getKey( const MapULongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerEnumHelper_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 || MapULongInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18561,26 +15489,21 @@ void MapULongInnerEnumHelperPubSubType::register_type_object_representation() MapULongInnerBitMaskHelperPubSubType::MapULongInnerBitMaskHelperPubSubType() { - setName("MapULongInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerBitMaskHelper"); + uint32_t type_size = MapULongInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerBitMaskHelperPubSubType::~MapULongInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18598,12 +15521,10 @@ bool MapULongInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18618,11 +15539,7 @@ bool MapULongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18639,11 +15556,7 @@ bool MapULongInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18660,52 +15573,43 @@ bool MapULongInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapULongInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerBitMaskHelperPubSubType::createData() +void* MapULongInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerBitMaskHelper()); } -void MapULongInnerBitMaskHelperPubSubType::deleteData( +void MapULongInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerBitMaskHelperPubSubType::getKey( +bool MapULongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18713,35 +15617,27 @@ bool MapULongInnerBitMaskHelperPubSubType::getKey( const MapULongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerBitMaskHelper_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 || MapULongInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18754,26 +15650,21 @@ void MapULongInnerBitMaskHelperPubSubType::register_type_object_representation() MapULongInnerAliasHelperPubSubType::MapULongInnerAliasHelperPubSubType() { - setName("MapULongInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasHelper"); + uint32_t type_size = MapULongInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasHelperPubSubType::~MapULongInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18791,12 +15682,10 @@ bool MapULongInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -18811,11 +15700,7 @@ bool MapULongInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -18832,11 +15717,7 @@ bool MapULongInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -18853,52 +15734,43 @@ bool MapULongInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasHelperPubSubType::createData() +void* MapULongInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasHelper()); } -void MapULongInnerAliasHelperPubSubType::deleteData( +void MapULongInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasHelperPubSubType::getKey( +bool MapULongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -18906,35 +15778,27 @@ bool MapULongInnerAliasHelperPubSubType::getKey( const MapULongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasHelper_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 || MapULongInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -18947,26 +15811,21 @@ void MapULongInnerAliasHelperPubSubType::register_type_object_representation() MapULongInnerAliasArrayHelperPubSubType::MapULongInnerAliasArrayHelperPubSubType() { - setName("MapULongInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasArrayHelper"); + uint32_t type_size = MapULongInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasArrayHelperPubSubType::~MapULongInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -18984,12 +15843,10 @@ bool MapULongInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19004,11 +15861,7 @@ bool MapULongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19025,11 +15878,7 @@ bool MapULongInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19046,52 +15895,43 @@ bool MapULongInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasArrayHelperPubSubType::createData() +void* MapULongInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasArrayHelper()); } -void MapULongInnerAliasArrayHelperPubSubType::deleteData( +void MapULongInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasArrayHelperPubSubType::getKey( +bool MapULongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19099,35 +15939,27 @@ bool MapULongInnerAliasArrayHelperPubSubType::getKey( const MapULongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasArrayHelper_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 || MapULongInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19140,26 +15972,21 @@ void MapULongInnerAliasArrayHelperPubSubType::register_type_object_representatio MapULongInnerAliasSequenceHelperPubSubType::MapULongInnerAliasSequenceHelperPubSubType() { - setName("MapULongInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasSequenceHelper"); + uint32_t type_size = MapULongInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasSequenceHelperPubSubType::~MapULongInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19177,12 +16004,10 @@ bool MapULongInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19197,11 +16022,7 @@ bool MapULongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19218,11 +16039,7 @@ bool MapULongInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19239,52 +16056,43 @@ bool MapULongInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasSequenceHelperPubSubType::createData() +void* MapULongInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasSequenceHelper()); } -void MapULongInnerAliasSequenceHelperPubSubType::deleteData( +void MapULongInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasSequenceHelperPubSubType::getKey( +bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19292,35 +16100,27 @@ bool MapULongInnerAliasSequenceHelperPubSubType::getKey( const MapULongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasSequenceHelper_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 || MapULongInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19333,26 +16133,21 @@ void MapULongInnerAliasSequenceHelperPubSubType::register_type_object_representa MapULongInnerAliasMapHelperPubSubType::MapULongInnerAliasMapHelperPubSubType() { - setName("MapULongInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerAliasMapHelper"); + uint32_t type_size = MapULongInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapULongInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerAliasMapHelperPubSubType::~MapULongInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19370,12 +16165,10 @@ bool MapULongInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19390,11 +16183,7 @@ bool MapULongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19411,11 +16200,7 @@ bool MapULongInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19432,52 +16217,43 @@ bool MapULongInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapULongInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerAliasMapHelperPubSubType::createData() +void* MapULongInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerAliasMapHelper()); } -void MapULongInnerAliasMapHelperPubSubType::deleteData( +void MapULongInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerAliasMapHelperPubSubType::getKey( +bool MapULongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19485,35 +16261,27 @@ bool MapULongInnerAliasMapHelperPubSubType::getKey( const MapULongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerAliasMapHelper_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 || MapULongInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19526,26 +16294,21 @@ void MapULongInnerAliasMapHelperPubSubType::register_type_object_representation( MapULongInnerUnionHelperPubSubType::MapULongInnerUnionHelperPubSubType() { - setName("MapULongInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerUnionHelper"); + uint32_t type_size = MapULongInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapULongInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapULongInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerUnionHelperPubSubType::~MapULongInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19563,12 +16326,10 @@ bool MapULongInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19583,11 +16344,7 @@ bool MapULongInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19604,11 +16361,7 @@ bool MapULongInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19625,52 +16378,43 @@ bool MapULongInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapULongInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerUnionHelperPubSubType::createData() +void* MapULongInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerUnionHelper()); } -void MapULongInnerUnionHelperPubSubType::deleteData( +void MapULongInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerUnionHelperPubSubType::getKey( +bool MapULongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19678,35 +16422,27 @@ bool MapULongInnerUnionHelperPubSubType::getKey( const MapULongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerUnionHelper_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 || MapULongInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19719,26 +16455,21 @@ void MapULongInnerUnionHelperPubSubType::register_type_object_representation() MapULongInnerStructureHelperPubSubType::MapULongInnerStructureHelperPubSubType() { - setName("MapULongInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerStructureHelper"); + uint32_t type_size = MapULongInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapULongInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapULongInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerStructureHelperPubSubType::~MapULongInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19756,12 +16487,10 @@ bool MapULongInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19776,11 +16505,7 @@ bool MapULongInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19797,11 +16522,7 @@ bool MapULongInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -19818,52 +16539,43 @@ bool MapULongInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapULongInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerStructureHelperPubSubType::createData() +void* MapULongInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerStructureHelper()); } -void MapULongInnerStructureHelperPubSubType::deleteData( +void MapULongInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerStructureHelperPubSubType::getKey( +bool MapULongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -19871,35 +16583,27 @@ bool MapULongInnerStructureHelperPubSubType::getKey( const MapULongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerStructureHelper_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 || MapULongInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -19912,26 +16616,21 @@ void MapULongInnerStructureHelperPubSubType::register_type_object_representation MapULongInnerBitsetHelperPubSubType::MapULongInnerBitsetHelperPubSubType() { - setName("MapULongInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapULongInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapULongInnerBitsetHelper"); + uint32_t type_size = MapULongInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapULongInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapULongInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongInnerBitsetHelperPubSubType::~MapULongInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -19949,12 +16648,10 @@ bool MapULongInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -19969,11 +16666,7 @@ bool MapULongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -19990,11 +16683,7 @@ bool MapULongInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20011,52 +16700,43 @@ bool MapULongInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapULongInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongInnerBitsetHelperPubSubType::createData() +void* MapULongInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapULongInnerBitsetHelper()); } -void MapULongInnerBitsetHelperPubSubType::deleteData( +void MapULongInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongInnerBitsetHelperPubSubType::getKey( +bool MapULongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20064,35 +16744,27 @@ bool MapULongInnerBitsetHelperPubSubType::getKey( const MapULongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongInnerBitsetHelper_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 || MapULongInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -20105,26 +16777,21 @@ void MapULongInnerBitsetHelperPubSubType::register_type_object_representation() MapLongLongShortPubSubType::MapLongLongShortPubSubType() { - setName("MapLongLongShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongShort::getMaxCdrSerializedSize()); -#else - MapLongLongShort_max_cdr_typesize; -#endif + set_name("MapLongLongShort"); + uint32_t type_size = MapLongLongShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongShort_max_key_cdr_typesize > 16 ? MapLongLongShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongShort_max_key_cdr_typesize > 16 ? MapLongLongShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongShortPubSubType::~MapLongLongShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -20142,12 +16809,10 @@ bool MapLongLongShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -20162,11 +16827,7 @@ bool MapLongLongShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -20183,11 +16844,7 @@ bool MapLongLongShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20204,52 +16861,43 @@ bool MapLongLongShortPubSubType::deserialize( return true; } -std::function MapLongLongShortPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongShortPubSubType::createData() +void* MapLongLongShortPubSubType::create_data() { return reinterpret_cast(new MapLongLongShort()); } -void MapLongLongShortPubSubType::deleteData( +void MapLongLongShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongShortPubSubType::getKey( +bool MapLongLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20257,35 +16905,27 @@ bool MapLongLongShortPubSubType::getKey( const MapLongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongShort_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 || MapLongLongShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -20298,26 +16938,21 @@ void MapLongLongShortPubSubType::register_type_object_representation() MapLongLongUShortPubSubType::MapLongLongUShortPubSubType() { - setName("MapLongLongUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongUShort::getMaxCdrSerializedSize()); -#else - MapLongLongUShort_max_cdr_typesize; -#endif + set_name("MapLongLongUShort"); + uint32_t type_size = MapLongLongUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongUShort_max_key_cdr_typesize > 16 ? MapLongLongUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongUShort_max_key_cdr_typesize > 16 ? MapLongLongUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongUShortPubSubType::~MapLongLongUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -20335,12 +16970,10 @@ bool MapLongLongUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -20355,11 +16988,7 @@ bool MapLongLongUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -20376,11 +17005,7 @@ bool MapLongLongUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20397,52 +17022,43 @@ bool MapLongLongUShortPubSubType::deserialize( return true; } -std::function MapLongLongUShortPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongUShortPubSubType::createData() +void* MapLongLongUShortPubSubType::create_data() { return reinterpret_cast(new MapLongLongUShort()); } -void MapLongLongUShortPubSubType::deleteData( +void MapLongLongUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongUShortPubSubType::getKey( +bool MapLongLongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20450,35 +17066,27 @@ bool MapLongLongUShortPubSubType::getKey( const MapLongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongUShort_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 || MapLongLongUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -20491,26 +17099,21 @@ void MapLongLongUShortPubSubType::register_type_object_representation() MapLongLongKeyLongValuePubSubType::MapLongLongKeyLongValuePubSubType() { - setName("MapLongLongKeyLongValue"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongKeyLongValue::getMaxCdrSerializedSize()); -#else - MapLongLongKeyLongValue_max_cdr_typesize; -#endif + set_name("MapLongLongKeyLongValue"); + uint32_t type_size = MapLongLongKeyLongValue_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongKeyLongValue_max_key_cdr_typesize > 16 ? MapLongLongKeyLongValue_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongKeyLongValue_max_key_cdr_typesize > 16 ? MapLongLongKeyLongValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongKeyLongValuePubSubType::~MapLongLongKeyLongValuePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -20528,12 +17131,10 @@ bool MapLongLongKeyLongValuePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -20548,11 +17149,7 @@ bool MapLongLongKeyLongValuePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -20569,11 +17166,7 @@ bool MapLongLongKeyLongValuePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20590,52 +17183,43 @@ bool MapLongLongKeyLongValuePubSubType::deserialize( return true; } -std::function MapLongLongKeyLongValuePubSubType::getSerializedSizeProvider( +uint32_t MapLongLongKeyLongValuePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongKeyLongValuePubSubType::createData() +void* MapLongLongKeyLongValuePubSubType::create_data() { return reinterpret_cast(new MapLongLongKeyLongValue()); } -void MapLongLongKeyLongValuePubSubType::deleteData( +void MapLongLongKeyLongValuePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongKeyLongValuePubSubType::getKey( +bool MapLongLongKeyLongValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20643,35 +17227,27 @@ bool MapLongLongKeyLongValuePubSubType::getKey( const MapLongLongKeyLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongKeyLongValue_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 || MapLongLongKeyLongValue_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -20684,26 +17260,21 @@ void MapLongLongKeyLongValuePubSubType::register_type_object_representation() MapLongLongULongPubSubType::MapLongLongULongPubSubType() { - setName("MapLongLongULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongULong::getMaxCdrSerializedSize()); -#else - MapLongLongULong_max_cdr_typesize; -#endif + set_name("MapLongLongULong"); + uint32_t type_size = MapLongLongULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongULong_max_key_cdr_typesize > 16 ? MapLongLongULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongULong_max_key_cdr_typesize > 16 ? MapLongLongULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongULongPubSubType::~MapLongLongULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -20721,12 +17292,10 @@ bool MapLongLongULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -20741,11 +17310,7 @@ bool MapLongLongULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -20762,11 +17327,7 @@ bool MapLongLongULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20783,52 +17344,43 @@ bool MapLongLongULongPubSubType::deserialize( return true; } -std::function MapLongLongULongPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongULongPubSubType::createData() +void* MapLongLongULongPubSubType::create_data() { return reinterpret_cast(new MapLongLongULong()); } -void MapLongLongULongPubSubType::deleteData( +void MapLongLongULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongULongPubSubType::getKey( +bool MapLongLongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -20836,35 +17388,27 @@ bool MapLongLongULongPubSubType::getKey( const MapLongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongULong_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 || MapLongLongULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -20877,26 +17421,21 @@ void MapLongLongULongPubSubType::register_type_object_representation() MapLongLongLongLongPubSubType::MapLongLongLongLongPubSubType() { - setName("MapLongLongLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongLongLong::getMaxCdrSerializedSize()); -#else - MapLongLongLongLong_max_cdr_typesize; -#endif + set_name("MapLongLongLongLong"); + uint32_t type_size = MapLongLongLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongLongLong_max_key_cdr_typesize > 16 ? MapLongLongLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongLongLong_max_key_cdr_typesize > 16 ? MapLongLongLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongLongLongPubSubType::~MapLongLongLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -20914,12 +17453,10 @@ bool MapLongLongLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -20934,11 +17471,7 @@ bool MapLongLongLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -20955,11 +17488,7 @@ bool MapLongLongLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -20976,52 +17505,43 @@ bool MapLongLongLongLongPubSubType::deserialize( return true; } -std::function MapLongLongLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongLongLongPubSubType::createData() +void* MapLongLongLongLongPubSubType::create_data() { return reinterpret_cast(new MapLongLongLongLong()); } -void MapLongLongLongLongPubSubType::deleteData( +void MapLongLongLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongLongLongPubSubType::getKey( +bool MapLongLongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21029,35 +17549,27 @@ bool MapLongLongLongLongPubSubType::getKey( const MapLongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongLongLong_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 || MapLongLongLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -21070,26 +17582,21 @@ void MapLongLongLongLongPubSubType::register_type_object_representation() MapLongLongULongLongPubSubType::MapLongLongULongLongPubSubType() { - setName("MapLongLongULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongULongLong::getMaxCdrSerializedSize()); -#else - MapLongLongULongLong_max_cdr_typesize; -#endif + set_name("MapLongLongULongLong"); + uint32_t type_size = MapLongLongULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongULongLong_max_key_cdr_typesize > 16 ? MapLongLongULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongULongLong_max_key_cdr_typesize > 16 ? MapLongLongULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongULongLongPubSubType::~MapLongLongULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -21107,12 +17614,10 @@ bool MapLongLongULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -21127,11 +17632,7 @@ bool MapLongLongULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -21148,11 +17649,7 @@ bool MapLongLongULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -21169,52 +17666,43 @@ bool MapLongLongULongLongPubSubType::deserialize( return true; } -std::function MapLongLongULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongULongLongPubSubType::createData() +void* MapLongLongULongLongPubSubType::create_data() { return reinterpret_cast(new MapLongLongULongLong()); } -void MapLongLongULongLongPubSubType::deleteData( +void MapLongLongULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongULongLongPubSubType::getKey( +bool MapLongLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21222,35 +17710,27 @@ bool MapLongLongULongLongPubSubType::getKey( const MapLongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongULongLong_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 || MapLongLongULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -21263,26 +17743,21 @@ void MapLongLongULongLongPubSubType::register_type_object_representation() MapLongLongFloatPubSubType::MapLongLongFloatPubSubType() { - setName("MapLongLongFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongFloat::getMaxCdrSerializedSize()); -#else - MapLongLongFloat_max_cdr_typesize; -#endif + set_name("MapLongLongFloat"); + uint32_t type_size = MapLongLongFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongFloat_max_key_cdr_typesize > 16 ? MapLongLongFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongFloat_max_key_cdr_typesize > 16 ? MapLongLongFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongFloatPubSubType::~MapLongLongFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -21300,12 +17775,10 @@ bool MapLongLongFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -21320,11 +17793,7 @@ bool MapLongLongFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -21341,11 +17810,7 @@ bool MapLongLongFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -21362,52 +17827,43 @@ bool MapLongLongFloatPubSubType::deserialize( return true; } -std::function MapLongLongFloatPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongFloatPubSubType::createData() +void* MapLongLongFloatPubSubType::create_data() { return reinterpret_cast(new MapLongLongFloat()); } -void MapLongLongFloatPubSubType::deleteData( +void MapLongLongFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongFloatPubSubType::getKey( +bool MapLongLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21415,35 +17871,27 @@ bool MapLongLongFloatPubSubType::getKey( const MapLongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongFloat_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 || MapLongLongFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -21456,26 +17904,21 @@ void MapLongLongFloatPubSubType::register_type_object_representation() MapLongLongKeyDoubleValuePubSubType::MapLongLongKeyDoubleValuePubSubType() { - setName("MapLongLongKeyDoubleValue"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongKeyDoubleValue::getMaxCdrSerializedSize()); -#else - MapLongLongKeyDoubleValue_max_cdr_typesize; -#endif + set_name("MapLongLongKeyDoubleValue"); + uint32_t type_size = MapLongLongKeyDoubleValue_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongKeyDoubleValue_max_key_cdr_typesize > 16 ? MapLongLongKeyDoubleValue_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongKeyDoubleValue_max_key_cdr_typesize > 16 ? MapLongLongKeyDoubleValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongKeyDoubleValuePubSubType::~MapLongLongKeyDoubleValuePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -21493,12 +17936,10 @@ bool MapLongLongKeyDoubleValuePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -21513,11 +17954,7 @@ bool MapLongLongKeyDoubleValuePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -21534,11 +17971,7 @@ bool MapLongLongKeyDoubleValuePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -21555,52 +17988,43 @@ bool MapLongLongKeyDoubleValuePubSubType::deserialize( return true; } -std::function MapLongLongKeyDoubleValuePubSubType::getSerializedSizeProvider( +uint32_t MapLongLongKeyDoubleValuePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongKeyDoubleValuePubSubType::createData() +void* MapLongLongKeyDoubleValuePubSubType::create_data() { return reinterpret_cast(new MapLongLongKeyDoubleValue()); } -void MapLongLongKeyDoubleValuePubSubType::deleteData( +void MapLongLongKeyDoubleValuePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongKeyDoubleValuePubSubType::getKey( +bool MapLongLongKeyDoubleValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21608,35 +18032,27 @@ bool MapLongLongKeyDoubleValuePubSubType::getKey( const MapLongLongKeyDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongKeyDoubleValue_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 || MapLongLongKeyDoubleValue_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -21649,26 +18065,21 @@ void MapLongLongKeyDoubleValuePubSubType::register_type_object_representation() MapLongLongLongDoublePubSubType::MapLongLongLongDoublePubSubType() { - setName("MapLongLongLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongLongDouble::getMaxCdrSerializedSize()); -#else - MapLongLongLongDouble_max_cdr_typesize; -#endif + set_name("MapLongLongLongDouble"); + uint32_t type_size = MapLongLongLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongLongDouble_max_key_cdr_typesize > 16 ? MapLongLongLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongLongDouble_max_key_cdr_typesize > 16 ? MapLongLongLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongLongDoublePubSubType::~MapLongLongLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -21686,12 +18097,10 @@ bool MapLongLongLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -21706,11 +18115,7 @@ bool MapLongLongLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -21727,11 +18132,7 @@ bool MapLongLongLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -21748,52 +18149,43 @@ bool MapLongLongLongDoublePubSubType::deserialize( return true; } -std::function MapLongLongLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapLongLongLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongLongDoublePubSubType::createData() +void* MapLongLongLongDoublePubSubType::create_data() { return reinterpret_cast(new MapLongLongLongDouble()); } -void MapLongLongLongDoublePubSubType::deleteData( +void MapLongLongLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongLongDoublePubSubType::getKey( +bool MapLongLongLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21801,35 +18193,27 @@ bool MapLongLongLongDoublePubSubType::getKey( const MapLongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongLongDouble_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 || MapLongLongLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -21842,26 +18226,21 @@ void MapLongLongLongDoublePubSubType::register_type_object_representation() MapLongLongBooleanPubSubType::MapLongLongBooleanPubSubType() { - setName("MapLongLongBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongBoolean::getMaxCdrSerializedSize()); -#else - MapLongLongBoolean_max_cdr_typesize; -#endif + set_name("MapLongLongBoolean"); + uint32_t type_size = MapLongLongBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongBoolean_max_key_cdr_typesize > 16 ? MapLongLongBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongBoolean_max_key_cdr_typesize > 16 ? MapLongLongBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongBooleanPubSubType::~MapLongLongBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -21879,12 +18258,10 @@ bool MapLongLongBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -21899,11 +18276,7 @@ bool MapLongLongBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -21920,11 +18293,7 @@ bool MapLongLongBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -21941,52 +18310,43 @@ bool MapLongLongBooleanPubSubType::deserialize( return true; } -std::function MapLongLongBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongBooleanPubSubType::createData() +void* MapLongLongBooleanPubSubType::create_data() { return reinterpret_cast(new MapLongLongBoolean()); } -void MapLongLongBooleanPubSubType::deleteData( +void MapLongLongBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongBooleanPubSubType::getKey( +bool MapLongLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -21994,35 +18354,27 @@ bool MapLongLongBooleanPubSubType::getKey( const MapLongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongBoolean_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 || MapLongLongBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -22035,26 +18387,21 @@ void MapLongLongBooleanPubSubType::register_type_object_representation() MapLongLongOctetPubSubType::MapLongLongOctetPubSubType() { - setName("MapLongLongOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongOctet::getMaxCdrSerializedSize()); -#else - MapLongLongOctet_max_cdr_typesize; -#endif + set_name("MapLongLongOctet"); + uint32_t type_size = MapLongLongOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongOctet_max_key_cdr_typesize > 16 ? MapLongLongOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongOctet_max_key_cdr_typesize > 16 ? MapLongLongOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongOctetPubSubType::~MapLongLongOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -22072,12 +18419,10 @@ bool MapLongLongOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -22092,11 +18437,7 @@ bool MapLongLongOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -22113,11 +18454,7 @@ bool MapLongLongOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -22134,52 +18471,43 @@ bool MapLongLongOctetPubSubType::deserialize( return true; } -std::function MapLongLongOctetPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongOctetPubSubType::createData() +void* MapLongLongOctetPubSubType::create_data() { return reinterpret_cast(new MapLongLongOctet()); } -void MapLongLongOctetPubSubType::deleteData( +void MapLongLongOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongOctetPubSubType::getKey( +bool MapLongLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -22187,35 +18515,27 @@ bool MapLongLongOctetPubSubType::getKey( const MapLongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongOctet_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 || MapLongLongOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -22228,26 +18548,21 @@ void MapLongLongOctetPubSubType::register_type_object_representation() MapLongLongCharPubSubType::MapLongLongCharPubSubType() { - setName("MapLongLongChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongChar::getMaxCdrSerializedSize()); -#else - MapLongLongChar_max_cdr_typesize; -#endif + set_name("MapLongLongChar"); + uint32_t type_size = MapLongLongChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongChar_max_key_cdr_typesize > 16 ? MapLongLongChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongChar_max_key_cdr_typesize > 16 ? MapLongLongChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongCharPubSubType::~MapLongLongCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -22265,12 +18580,10 @@ bool MapLongLongCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -22285,11 +18598,7 @@ bool MapLongLongCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -22306,11 +18615,7 @@ bool MapLongLongCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -22327,52 +18632,43 @@ bool MapLongLongCharPubSubType::deserialize( return true; } -std::function MapLongLongCharPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongCharPubSubType::createData() +void* MapLongLongCharPubSubType::create_data() { return reinterpret_cast(new MapLongLongChar()); } -void MapLongLongCharPubSubType::deleteData( +void MapLongLongCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongCharPubSubType::getKey( +bool MapLongLongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -22380,35 +18676,27 @@ bool MapLongLongCharPubSubType::getKey( const MapLongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongChar_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 || MapLongLongChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -22421,26 +18709,21 @@ void MapLongLongCharPubSubType::register_type_object_representation() MapLongLongWCharPubSubType::MapLongLongWCharPubSubType() { - setName("MapLongLongWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongWChar::getMaxCdrSerializedSize()); -#else - MapLongLongWChar_max_cdr_typesize; -#endif + set_name("MapLongLongWChar"); + uint32_t type_size = MapLongLongWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongWChar_max_key_cdr_typesize > 16 ? MapLongLongWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongWChar_max_key_cdr_typesize > 16 ? MapLongLongWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongWCharPubSubType::~MapLongLongWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -22458,12 +18741,10 @@ bool MapLongLongWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -22478,11 +18759,7 @@ bool MapLongLongWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -22499,11 +18776,7 @@ bool MapLongLongWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -22520,52 +18793,43 @@ bool MapLongLongWCharPubSubType::deserialize( return true; } -std::function MapLongLongWCharPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongWCharPubSubType::createData() +void* MapLongLongWCharPubSubType::create_data() { return reinterpret_cast(new MapLongLongWChar()); } -void MapLongLongWCharPubSubType::deleteData( +void MapLongLongWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongWCharPubSubType::getKey( +bool MapLongLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -22573,35 +18837,27 @@ bool MapLongLongWCharPubSubType::getKey( const MapLongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongWChar_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 || MapLongLongWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -22614,26 +18870,21 @@ void MapLongLongWCharPubSubType::register_type_object_representation() MapLongLongStringPubSubType::MapLongLongStringPubSubType() { - setName("MapLongLongString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongString::getMaxCdrSerializedSize()); -#else - MapLongLongString_max_cdr_typesize; -#endif + set_name("MapLongLongString"); + uint32_t type_size = MapLongLongString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongString_max_key_cdr_typesize > 16 ? MapLongLongString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongString_max_key_cdr_typesize > 16 ? MapLongLongString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongStringPubSubType::~MapLongLongStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -22651,12 +18902,10 @@ bool MapLongLongStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -22671,11 +18920,7 @@ bool MapLongLongStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -22692,11 +18937,7 @@ bool MapLongLongStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -22713,52 +18954,43 @@ bool MapLongLongStringPubSubType::deserialize( return true; } -std::function MapLongLongStringPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongStringPubSubType::createData() +void* MapLongLongStringPubSubType::create_data() { return reinterpret_cast(new MapLongLongString()); } -void MapLongLongStringPubSubType::deleteData( +void MapLongLongStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongStringPubSubType::getKey( +bool MapLongLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -22766,35 +18998,27 @@ bool MapLongLongStringPubSubType::getKey( const MapLongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongString_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 || MapLongLongString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -22807,26 +19031,21 @@ void MapLongLongStringPubSubType::register_type_object_representation() MapLongLongWStringPubSubType::MapLongLongWStringPubSubType() { - setName("MapLongLongWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongWString::getMaxCdrSerializedSize()); -#else - MapLongLongWString_max_cdr_typesize; -#endif + set_name("MapLongLongWString"); + uint32_t type_size = MapLongLongWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongWString_max_key_cdr_typesize > 16 ? MapLongLongWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongWString_max_key_cdr_typesize > 16 ? MapLongLongWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongWStringPubSubType::~MapLongLongWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -22844,12 +19063,10 @@ bool MapLongLongWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -22864,11 +19081,7 @@ bool MapLongLongWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -22885,11 +19098,7 @@ bool MapLongLongWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -22906,52 +19115,43 @@ bool MapLongLongWStringPubSubType::deserialize( return true; } -std::function MapLongLongWStringPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongWStringPubSubType::createData() +void* MapLongLongWStringPubSubType::create_data() { return reinterpret_cast(new MapLongLongWString()); } -void MapLongLongWStringPubSubType::deleteData( +void MapLongLongWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongWStringPubSubType::getKey( +bool MapLongLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -22959,35 +19159,27 @@ bool MapLongLongWStringPubSubType::getKey( const MapLongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongWString_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 || MapLongLongWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23000,26 +19192,21 @@ void MapLongLongWStringPubSubType::register_type_object_representation() MapLongLongInnerAliasBoundedStringHelperPubSubType::MapLongLongInnerAliasBoundedStringHelperPubSubType() { - setName("MapLongLongInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasBoundedStringHelper"); + uint32_t type_size = MapLongLongInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasBoundedStringHelperPubSubType::~MapLongLongInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -23037,12 +19224,10 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -23057,11 +19242,7 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -23078,11 +19259,7 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -23099,52 +19276,43 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasBoundedStringHelperPubSubType::createData() +void* MapLongLongInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasBoundedStringHelper()); } -void MapLongLongInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapLongLongInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -23152,35 +19320,27 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::getKey( const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasBoundedStringHelper_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 || MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23193,26 +19353,21 @@ void MapLongLongInnerAliasBoundedStringHelperPubSubType::register_type_object_re MapLongLongInnerAliasBoundedWStringHelperPubSubType::MapLongLongInnerAliasBoundedWStringHelperPubSubType() { - setName("MapLongLongInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapLongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasBoundedWStringHelperPubSubType::~MapLongLongInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -23230,12 +19385,10 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -23250,11 +19403,7 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -23271,11 +19420,7 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -23292,52 +19437,43 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapLongLongInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasBoundedWStringHelper()); } -void MapLongLongInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapLongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -23345,35 +19481,27 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::getKey( const MapLongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasBoundedWStringHelper_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 || MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23386,26 +19514,21 @@ void MapLongLongInnerAliasBoundedWStringHelperPubSubType::register_type_object_r MapLongLongInnerEnumHelperPubSubType::MapLongLongInnerEnumHelperPubSubType() { - setName("MapLongLongInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerEnumHelper"); + uint32_t type_size = MapLongLongInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerEnumHelperPubSubType::~MapLongLongInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -23423,12 +19546,10 @@ bool MapLongLongInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -23443,11 +19564,7 @@ bool MapLongLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -23464,11 +19581,7 @@ bool MapLongLongInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -23485,52 +19598,43 @@ bool MapLongLongInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerEnumHelperPubSubType::createData() +void* MapLongLongInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerEnumHelper()); } -void MapLongLongInnerEnumHelperPubSubType::deleteData( +void MapLongLongInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerEnumHelperPubSubType::getKey( +bool MapLongLongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -23538,35 +19642,27 @@ bool MapLongLongInnerEnumHelperPubSubType::getKey( const MapLongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerEnumHelper_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 || MapLongLongInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23579,26 +19675,21 @@ void MapLongLongInnerEnumHelperPubSubType::register_type_object_representation() MapLongLongInnerBitMaskHelperPubSubType::MapLongLongInnerBitMaskHelperPubSubType() { - setName("MapLongLongInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerBitMaskHelper"); + uint32_t type_size = MapLongLongInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerBitMaskHelperPubSubType::~MapLongLongInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -23616,12 +19707,10 @@ bool MapLongLongInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -23636,11 +19725,7 @@ bool MapLongLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -23657,11 +19742,7 @@ bool MapLongLongInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -23678,52 +19759,43 @@ bool MapLongLongInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerBitMaskHelperPubSubType::createData() +void* MapLongLongInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerBitMaskHelper()); } -void MapLongLongInnerBitMaskHelperPubSubType::deleteData( +void MapLongLongInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerBitMaskHelperPubSubType::getKey( +bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -23731,35 +19803,27 @@ bool MapLongLongInnerBitMaskHelperPubSubType::getKey( const MapLongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerBitMaskHelper_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 || MapLongLongInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23772,26 +19836,21 @@ void MapLongLongInnerBitMaskHelperPubSubType::register_type_object_representatio MapLongLongInnerAliasHelperPubSubType::MapLongLongInnerAliasHelperPubSubType() { - setName("MapLongLongInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasHelper"); + uint32_t type_size = MapLongLongInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasHelperPubSubType::~MapLongLongInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -23809,12 +19868,10 @@ bool MapLongLongInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -23829,11 +19886,7 @@ bool MapLongLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -23850,11 +19903,7 @@ bool MapLongLongInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -23871,52 +19920,43 @@ bool MapLongLongInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasHelperPubSubType::createData() +void* MapLongLongInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasHelper()); } -void MapLongLongInnerAliasHelperPubSubType::deleteData( +void MapLongLongInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasHelperPubSubType::getKey( +bool MapLongLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -23924,35 +19964,27 @@ bool MapLongLongInnerAliasHelperPubSubType::getKey( const MapLongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasHelper_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 || MapLongLongInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -23965,26 +19997,21 @@ void MapLongLongInnerAliasHelperPubSubType::register_type_object_representation( MapLongLongInnerAliasArrayHelperPubSubType::MapLongLongInnerAliasArrayHelperPubSubType() { - setName("MapLongLongInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasArrayHelper"); + uint32_t type_size = MapLongLongInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasArrayHelperPubSubType::~MapLongLongInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24002,12 +20029,10 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24022,11 +20047,7 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -24043,11 +20064,7 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -24064,52 +20081,43 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasArrayHelperPubSubType::createData() +void* MapLongLongInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasArrayHelper()); } -void MapLongLongInnerAliasArrayHelperPubSubType::deleteData( +void MapLongLongInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasArrayHelperPubSubType::getKey( +bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -24117,35 +20125,27 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::getKey( const MapLongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasArrayHelper_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 || MapLongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -24158,26 +20158,21 @@ void MapLongLongInnerAliasArrayHelperPubSubType::register_type_object_representa MapLongLongInnerAliasSequenceHelperPubSubType::MapLongLongInnerAliasSequenceHelperPubSubType() { - setName("MapLongLongInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasSequenceHelper"); + uint32_t type_size = MapLongLongInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasSequenceHelperPubSubType::~MapLongLongInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24195,12 +20190,10 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24215,11 +20208,7 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -24236,11 +20225,7 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -24257,52 +20242,43 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasSequenceHelperPubSubType::createData() +void* MapLongLongInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasSequenceHelper()); } -void MapLongLongInnerAliasSequenceHelperPubSubType::deleteData( +void MapLongLongInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasSequenceHelperPubSubType::getKey( +bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -24310,35 +20286,27 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::getKey( const MapLongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasSequenceHelper_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 || MapLongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -24351,26 +20319,21 @@ void MapLongLongInnerAliasSequenceHelperPubSubType::register_type_object_represe MapLongLongInnerAliasMapHelperPubSubType::MapLongLongInnerAliasMapHelperPubSubType() { - setName("MapLongLongInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerAliasMapHelper"); + uint32_t type_size = MapLongLongInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerAliasMapHelperPubSubType::~MapLongLongInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24388,12 +20351,10 @@ bool MapLongLongInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24408,11 +20369,7 @@ bool MapLongLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -24429,11 +20386,7 @@ bool MapLongLongInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -24450,52 +20403,43 @@ bool MapLongLongInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerAliasMapHelperPubSubType::createData() +void* MapLongLongInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerAliasMapHelper()); } -void MapLongLongInnerAliasMapHelperPubSubType::deleteData( +void MapLongLongInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerAliasMapHelperPubSubType::getKey( +bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -24503,35 +20447,27 @@ bool MapLongLongInnerAliasMapHelperPubSubType::getKey( const MapLongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerAliasMapHelper_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 || MapLongLongInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -24544,26 +20480,21 @@ void MapLongLongInnerAliasMapHelperPubSubType::register_type_object_representati MapLongLongInnerUnionHelperPubSubType::MapLongLongInnerUnionHelperPubSubType() { - setName("MapLongLongInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerUnionHelper"); + uint32_t type_size = MapLongLongInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerUnionHelperPubSubType::~MapLongLongInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24581,12 +20512,10 @@ bool MapLongLongInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24601,11 +20530,7 @@ bool MapLongLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -24622,11 +20547,7 @@ bool MapLongLongInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -24643,52 +20564,43 @@ bool MapLongLongInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerUnionHelperPubSubType::createData() +void* MapLongLongInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerUnionHelper()); } -void MapLongLongInnerUnionHelperPubSubType::deleteData( +void MapLongLongInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerUnionHelperPubSubType::getKey( +bool MapLongLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -24696,35 +20608,27 @@ bool MapLongLongInnerUnionHelperPubSubType::getKey( const MapLongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerUnionHelper_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 || MapLongLongInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -24737,26 +20641,21 @@ void MapLongLongInnerUnionHelperPubSubType::register_type_object_representation( MapLongLongInnerStructureHelperPubSubType::MapLongLongInnerStructureHelperPubSubType() { - setName("MapLongLongInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerStructureHelper"); + uint32_t type_size = MapLongLongInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerStructureHelperPubSubType::~MapLongLongInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24774,12 +20673,10 @@ bool MapLongLongInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24794,11 +20691,7 @@ bool MapLongLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -24815,11 +20708,7 @@ bool MapLongLongInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -24836,52 +20725,43 @@ bool MapLongLongInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerStructureHelperPubSubType::createData() +void* MapLongLongInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerStructureHelper()); } -void MapLongLongInnerStructureHelperPubSubType::deleteData( +void MapLongLongInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerStructureHelperPubSubType::getKey( +bool MapLongLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -24889,35 +20769,27 @@ bool MapLongLongInnerStructureHelperPubSubType::getKey( const MapLongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerStructureHelper_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 || MapLongLongInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -24930,26 +20802,21 @@ void MapLongLongInnerStructureHelperPubSubType::register_type_object_representat MapLongLongInnerBitsetHelperPubSubType::MapLongLongInnerBitsetHelperPubSubType() { - setName("MapLongLongInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapLongLongInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapLongLongInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapLongLongInnerBitsetHelper"); + uint32_t type_size = MapLongLongInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapLongLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapLongLongInnerBitsetHelperPubSubType::~MapLongLongInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -24967,12 +20834,10 @@ bool MapLongLongInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -24987,11 +20852,7 @@ bool MapLongLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25008,11 +20869,7 @@ bool MapLongLongInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25029,52 +20886,43 @@ bool MapLongLongInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapLongLongInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapLongLongInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapLongLongInnerBitsetHelperPubSubType::createData() +void* MapLongLongInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapLongLongInnerBitsetHelper()); } -void MapLongLongInnerBitsetHelperPubSubType::deleteData( +void MapLongLongInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapLongLongInnerBitsetHelperPubSubType::getKey( +bool MapLongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -25082,35 +20930,27 @@ bool MapLongLongInnerBitsetHelperPubSubType::getKey( const MapLongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapLongLongInnerBitsetHelper_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 || MapLongLongInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -25123,26 +20963,21 @@ void MapLongLongInnerBitsetHelperPubSubType::register_type_object_representation MapULongLongShortPubSubType::MapULongLongShortPubSubType() { - setName("MapULongLongShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongShort::getMaxCdrSerializedSize()); -#else - MapULongLongShort_max_cdr_typesize; -#endif + set_name("MapULongLongShort"); + uint32_t type_size = MapULongLongShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongShort_max_key_cdr_typesize > 16 ? MapULongLongShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongShort_max_key_cdr_typesize > 16 ? MapULongLongShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongShortPubSubType::~MapULongLongShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -25160,12 +20995,10 @@ bool MapULongLongShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -25180,11 +21013,7 @@ bool MapULongLongShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25201,11 +21030,7 @@ bool MapULongLongShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25222,52 +21047,43 @@ bool MapULongLongShortPubSubType::deserialize( return true; } -std::function MapULongLongShortPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongShortPubSubType::createData() +void* MapULongLongShortPubSubType::create_data() { return reinterpret_cast(new MapULongLongShort()); } -void MapULongLongShortPubSubType::deleteData( +void MapULongLongShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongShortPubSubType::getKey( +bool MapULongLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -25275,35 +21091,27 @@ bool MapULongLongShortPubSubType::getKey( const MapULongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongShort_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 || MapULongLongShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -25316,26 +21124,21 @@ void MapULongLongShortPubSubType::register_type_object_representation() MapULongLongUShortPubSubType::MapULongLongUShortPubSubType() { - setName("MapULongLongUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongUShort::getMaxCdrSerializedSize()); -#else - MapULongLongUShort_max_cdr_typesize; -#endif + set_name("MapULongLongUShort"); + uint32_t type_size = MapULongLongUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongUShort_max_key_cdr_typesize > 16 ? MapULongLongUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongUShort_max_key_cdr_typesize > 16 ? MapULongLongUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongUShortPubSubType::~MapULongLongUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -25353,12 +21156,10 @@ bool MapULongLongUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -25373,11 +21174,7 @@ bool MapULongLongUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25394,11 +21191,7 @@ bool MapULongLongUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25415,52 +21208,43 @@ bool MapULongLongUShortPubSubType::deserialize( return true; } -std::function MapULongLongUShortPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongUShortPubSubType::createData() +void* MapULongLongUShortPubSubType::create_data() { return reinterpret_cast(new MapULongLongUShort()); } -void MapULongLongUShortPubSubType::deleteData( +void MapULongLongUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongUShortPubSubType::getKey( +bool MapULongLongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -25468,35 +21252,27 @@ bool MapULongLongUShortPubSubType::getKey( const MapULongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongUShort_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 || MapULongLongUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -25509,26 +21285,21 @@ void MapULongLongUShortPubSubType::register_type_object_representation() MapULongLongLongPubSubType::MapULongLongLongPubSubType() { - setName("MapULongLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongLong::getMaxCdrSerializedSize()); -#else - MapULongLongLong_max_cdr_typesize; -#endif + set_name("MapULongLongLong"); + uint32_t type_size = MapULongLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongLongPubSubType::~MapULongLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -25546,12 +21317,10 @@ bool MapULongLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -25566,11 +21335,7 @@ bool MapULongLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25587,11 +21352,7 @@ bool MapULongLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25608,52 +21369,43 @@ bool MapULongLongLongPubSubType::deserialize( return true; } -std::function MapULongLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongLongPubSubType::createData() +void* MapULongLongLongPubSubType::create_data() { return reinterpret_cast(new MapULongLongLong()); } -void MapULongLongLongPubSubType::deleteData( +void MapULongLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongLongPubSubType::getKey( +bool MapULongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -25661,35 +21413,27 @@ bool MapULongLongLongPubSubType::getKey( const MapULongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongLong_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 || MapULongLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -25702,26 +21446,21 @@ void MapULongLongLongPubSubType::register_type_object_representation() MapULongLongULongPubSubType::MapULongLongULongPubSubType() { - setName("MapULongLongULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongULong::getMaxCdrSerializedSize()); -#else - MapULongLongULong_max_cdr_typesize; -#endif + set_name("MapULongLongULong"); + uint32_t type_size = MapULongLongULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongULong_max_key_cdr_typesize > 16 ? MapULongLongULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongULong_max_key_cdr_typesize > 16 ? MapULongLongULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongULongPubSubType::~MapULongLongULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -25739,12 +21478,10 @@ bool MapULongLongULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -25759,11 +21496,7 @@ bool MapULongLongULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25780,11 +21513,7 @@ bool MapULongLongULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25801,52 +21530,43 @@ bool MapULongLongULongPubSubType::deserialize( return true; } -std::function MapULongLongULongPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongULongPubSubType::createData() +void* MapULongLongULongPubSubType::create_data() { return reinterpret_cast(new MapULongLongULong()); } -void MapULongLongULongPubSubType::deleteData( +void MapULongLongULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongULongPubSubType::getKey( +bool MapULongLongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -25854,35 +21574,27 @@ bool MapULongLongULongPubSubType::getKey( const MapULongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongULong_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 || MapULongLongULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -25895,26 +21607,21 @@ void MapULongLongULongPubSubType::register_type_object_representation() MapULongLongLongLongPubSubType::MapULongLongLongLongPubSubType() { - setName("MapULongLongLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongLongLong::getMaxCdrSerializedSize()); -#else - MapULongLongLongLong_max_cdr_typesize; -#endif + set_name("MapULongLongLongLong"); + uint32_t type_size = MapULongLongLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongLongLongPubSubType::~MapULongLongLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -25932,12 +21639,10 @@ bool MapULongLongLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -25952,11 +21657,7 @@ bool MapULongLongLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -25973,11 +21674,7 @@ bool MapULongLongLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -25994,52 +21691,43 @@ bool MapULongLongLongLongPubSubType::deserialize( return true; } -std::function MapULongLongLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongLongLongPubSubType::createData() +void* MapULongLongLongLongPubSubType::create_data() { return reinterpret_cast(new MapULongLongLongLong()); } -void MapULongLongLongLongPubSubType::deleteData( +void MapULongLongLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongLongLongPubSubType::getKey( +bool MapULongLongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -26047,35 +21735,27 @@ bool MapULongLongLongLongPubSubType::getKey( const MapULongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongLongLong_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 || MapULongLongLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -26088,26 +21768,21 @@ void MapULongLongLongLongPubSubType::register_type_object_representation() MapULongLongULongLongPubSubType::MapULongLongULongLongPubSubType() { - setName("MapULongLongULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongULongLong::getMaxCdrSerializedSize()); -#else - MapULongLongULongLong_max_cdr_typesize; -#endif + set_name("MapULongLongULongLong"); + uint32_t type_size = MapULongLongULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongULongLong_max_key_cdr_typesize > 16 ? MapULongLongULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongULongLong_max_key_cdr_typesize > 16 ? MapULongLongULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongULongLongPubSubType::~MapULongLongULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -26125,12 +21800,10 @@ bool MapULongLongULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -26145,11 +21818,7 @@ bool MapULongLongULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -26166,11 +21835,7 @@ bool MapULongLongULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -26187,52 +21852,43 @@ bool MapULongLongULongLongPubSubType::deserialize( return true; } -std::function MapULongLongULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongULongLongPubSubType::createData() +void* MapULongLongULongLongPubSubType::create_data() { return reinterpret_cast(new MapULongLongULongLong()); } -void MapULongLongULongLongPubSubType::deleteData( +void MapULongLongULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongULongLongPubSubType::getKey( +bool MapULongLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -26240,35 +21896,27 @@ bool MapULongLongULongLongPubSubType::getKey( const MapULongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongULongLong_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 || MapULongLongULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -26281,26 +21929,21 @@ void MapULongLongULongLongPubSubType::register_type_object_representation() MapULongLongFloatPubSubType::MapULongLongFloatPubSubType() { - setName("MapULongLongFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongFloat::getMaxCdrSerializedSize()); -#else - MapULongLongFloat_max_cdr_typesize; -#endif + set_name("MapULongLongFloat"); + uint32_t type_size = MapULongLongFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongFloat_max_key_cdr_typesize > 16 ? MapULongLongFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongFloat_max_key_cdr_typesize > 16 ? MapULongLongFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongFloatPubSubType::~MapULongLongFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -26318,12 +21961,10 @@ bool MapULongLongFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -26338,11 +21979,7 @@ bool MapULongLongFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -26359,11 +21996,7 @@ bool MapULongLongFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -26380,52 +22013,43 @@ bool MapULongLongFloatPubSubType::deserialize( return true; } -std::function MapULongLongFloatPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongFloatPubSubType::createData() +void* MapULongLongFloatPubSubType::create_data() { return reinterpret_cast(new MapULongLongFloat()); } -void MapULongLongFloatPubSubType::deleteData( +void MapULongLongFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongFloatPubSubType::getKey( +bool MapULongLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -26433,35 +22057,27 @@ bool MapULongLongFloatPubSubType::getKey( const MapULongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongFloat_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 || MapULongLongFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -26474,26 +22090,21 @@ void MapULongLongFloatPubSubType::register_type_object_representation() MapKeyULongLongValueDoublePubSubType::MapKeyULongLongValueDoublePubSubType() { - setName("MapKeyULongLongValueDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapKeyULongLongValueDouble::getMaxCdrSerializedSize()); -#else - MapKeyULongLongValueDouble_max_cdr_typesize; -#endif + set_name("MapKeyULongLongValueDouble"); + uint32_t type_size = MapKeyULongLongValueDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapKeyULongLongValueDouble_max_key_cdr_typesize > 16 ? MapKeyULongLongValueDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapKeyULongLongValueDouble_max_key_cdr_typesize > 16 ? MapKeyULongLongValueDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapKeyULongLongValueDoublePubSubType::~MapKeyULongLongValueDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -26511,12 +22122,10 @@ bool MapKeyULongLongValueDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -26531,11 +22140,7 @@ bool MapKeyULongLongValueDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -26552,11 +22157,7 @@ bool MapKeyULongLongValueDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -26573,52 +22174,43 @@ bool MapKeyULongLongValueDoublePubSubType::deserialize( return true; } -std::function MapKeyULongLongValueDoublePubSubType::getSerializedSizeProvider( +uint32_t MapKeyULongLongValueDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapKeyULongLongValueDoublePubSubType::createData() +void* MapKeyULongLongValueDoublePubSubType::create_data() { return reinterpret_cast(new MapKeyULongLongValueDouble()); } -void MapKeyULongLongValueDoublePubSubType::deleteData( +void MapKeyULongLongValueDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapKeyULongLongValueDoublePubSubType::getKey( +bool MapKeyULongLongValueDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -26626,35 +22218,27 @@ bool MapKeyULongLongValueDoublePubSubType::getKey( const MapKeyULongLongValueDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapKeyULongLongValueDouble_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 || MapKeyULongLongValueDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -26667,26 +22251,21 @@ void MapKeyULongLongValueDoublePubSubType::register_type_object_representation() MapULongLongLongDoublePubSubType::MapULongLongLongDoublePubSubType() { - setName("MapULongLongLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongLongDouble::getMaxCdrSerializedSize()); -#else - MapULongLongLongDouble_max_cdr_typesize; -#endif + set_name("MapULongLongLongDouble"); + uint32_t type_size = MapULongLongLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongLongDouble_max_key_cdr_typesize > 16 ? MapULongLongLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongLongDouble_max_key_cdr_typesize > 16 ? MapULongLongLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongLongDoublePubSubType::~MapULongLongLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -26704,12 +22283,10 @@ bool MapULongLongLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -26724,11 +22301,7 @@ bool MapULongLongLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -26745,11 +22318,7 @@ bool MapULongLongLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -26766,52 +22335,43 @@ bool MapULongLongLongDoublePubSubType::deserialize( return true; } -std::function MapULongLongLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapULongLongLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongLongDoublePubSubType::createData() +void* MapULongLongLongDoublePubSubType::create_data() { return reinterpret_cast(new MapULongLongLongDouble()); } -void MapULongLongLongDoublePubSubType::deleteData( +void MapULongLongLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongLongDoublePubSubType::getKey( +bool MapULongLongLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -26819,35 +22379,27 @@ bool MapULongLongLongDoublePubSubType::getKey( const MapULongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongLongDouble_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 || MapULongLongLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -26860,26 +22412,21 @@ void MapULongLongLongDoublePubSubType::register_type_object_representation() MapULongLongBooleanPubSubType::MapULongLongBooleanPubSubType() { - setName("MapULongLongBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongBoolean::getMaxCdrSerializedSize()); -#else - MapULongLongBoolean_max_cdr_typesize; -#endif + set_name("MapULongLongBoolean"); + uint32_t type_size = MapULongLongBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongBoolean_max_key_cdr_typesize > 16 ? MapULongLongBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongBoolean_max_key_cdr_typesize > 16 ? MapULongLongBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongBooleanPubSubType::~MapULongLongBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -26897,12 +22444,10 @@ bool MapULongLongBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -26917,11 +22462,7 @@ bool MapULongLongBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -26938,11 +22479,7 @@ bool MapULongLongBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -26959,52 +22496,43 @@ bool MapULongLongBooleanPubSubType::deserialize( return true; } -std::function MapULongLongBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongBooleanPubSubType::createData() +void* MapULongLongBooleanPubSubType::create_data() { return reinterpret_cast(new MapULongLongBoolean()); } -void MapULongLongBooleanPubSubType::deleteData( +void MapULongLongBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongBooleanPubSubType::getKey( +bool MapULongLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27012,35 +22540,27 @@ bool MapULongLongBooleanPubSubType::getKey( const MapULongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongBoolean_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 || MapULongLongBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -27053,26 +22573,21 @@ void MapULongLongBooleanPubSubType::register_type_object_representation() MapULongLongOctetPubSubType::MapULongLongOctetPubSubType() { - setName("MapULongLongOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongOctet::getMaxCdrSerializedSize()); -#else - MapULongLongOctet_max_cdr_typesize; -#endif + set_name("MapULongLongOctet"); + uint32_t type_size = MapULongLongOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongOctet_max_key_cdr_typesize > 16 ? MapULongLongOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongOctet_max_key_cdr_typesize > 16 ? MapULongLongOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongOctetPubSubType::~MapULongLongOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -27090,12 +22605,10 @@ bool MapULongLongOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -27110,11 +22623,7 @@ bool MapULongLongOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -27131,11 +22640,7 @@ bool MapULongLongOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -27152,52 +22657,43 @@ bool MapULongLongOctetPubSubType::deserialize( return true; } -std::function MapULongLongOctetPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongOctetPubSubType::createData() +void* MapULongLongOctetPubSubType::create_data() { return reinterpret_cast(new MapULongLongOctet()); } -void MapULongLongOctetPubSubType::deleteData( +void MapULongLongOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongOctetPubSubType::getKey( +bool MapULongLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27205,35 +22701,27 @@ bool MapULongLongOctetPubSubType::getKey( const MapULongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongOctet_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 || MapULongLongOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -27246,26 +22734,21 @@ void MapULongLongOctetPubSubType::register_type_object_representation() MapULongLongCharPubSubType::MapULongLongCharPubSubType() { - setName("MapULongLongChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongChar::getMaxCdrSerializedSize()); -#else - MapULongLongChar_max_cdr_typesize; -#endif + set_name("MapULongLongChar"); + uint32_t type_size = MapULongLongChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongChar_max_key_cdr_typesize > 16 ? MapULongLongChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongChar_max_key_cdr_typesize > 16 ? MapULongLongChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongCharPubSubType::~MapULongLongCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -27283,12 +22766,10 @@ bool MapULongLongCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -27303,11 +22784,7 @@ bool MapULongLongCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -27324,11 +22801,7 @@ bool MapULongLongCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -27345,52 +22818,43 @@ bool MapULongLongCharPubSubType::deserialize( return true; } -std::function MapULongLongCharPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongCharPubSubType::createData() +void* MapULongLongCharPubSubType::create_data() { return reinterpret_cast(new MapULongLongChar()); } -void MapULongLongCharPubSubType::deleteData( +void MapULongLongCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongCharPubSubType::getKey( +bool MapULongLongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27398,35 +22862,27 @@ bool MapULongLongCharPubSubType::getKey( const MapULongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongChar_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 || MapULongLongChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -27439,26 +22895,21 @@ void MapULongLongCharPubSubType::register_type_object_representation() MapULongLongWCharPubSubType::MapULongLongWCharPubSubType() { - setName("MapULongLongWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongWChar::getMaxCdrSerializedSize()); -#else - MapULongLongWChar_max_cdr_typesize; -#endif + set_name("MapULongLongWChar"); + uint32_t type_size = MapULongLongWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongWChar_max_key_cdr_typesize > 16 ? MapULongLongWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongWChar_max_key_cdr_typesize > 16 ? MapULongLongWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongWCharPubSubType::~MapULongLongWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -27476,12 +22927,10 @@ bool MapULongLongWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -27496,11 +22945,7 @@ bool MapULongLongWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -27517,11 +22962,7 @@ bool MapULongLongWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -27538,52 +22979,43 @@ bool MapULongLongWCharPubSubType::deserialize( return true; } -std::function MapULongLongWCharPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongWCharPubSubType::createData() +void* MapULongLongWCharPubSubType::create_data() { return reinterpret_cast(new MapULongLongWChar()); } -void MapULongLongWCharPubSubType::deleteData( +void MapULongLongWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongWCharPubSubType::getKey( +bool MapULongLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27591,35 +23023,27 @@ bool MapULongLongWCharPubSubType::getKey( const MapULongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongWChar_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 || MapULongLongWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -27632,26 +23056,21 @@ void MapULongLongWCharPubSubType::register_type_object_representation() MapULongLongStringPubSubType::MapULongLongStringPubSubType() { - setName("MapULongLongString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongString::getMaxCdrSerializedSize()); -#else - MapULongLongString_max_cdr_typesize; -#endif + set_name("MapULongLongString"); + uint32_t type_size = MapULongLongString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongString_max_key_cdr_typesize > 16 ? MapULongLongString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongString_max_key_cdr_typesize > 16 ? MapULongLongString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongStringPubSubType::~MapULongLongStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -27669,12 +23088,10 @@ bool MapULongLongStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -27689,11 +23106,7 @@ bool MapULongLongStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -27710,11 +23123,7 @@ bool MapULongLongStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -27731,52 +23140,43 @@ bool MapULongLongStringPubSubType::deserialize( return true; } -std::function MapULongLongStringPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongStringPubSubType::createData() +void* MapULongLongStringPubSubType::create_data() { return reinterpret_cast(new MapULongLongString()); } -void MapULongLongStringPubSubType::deleteData( +void MapULongLongStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongStringPubSubType::getKey( +bool MapULongLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27784,35 +23184,27 @@ bool MapULongLongStringPubSubType::getKey( const MapULongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongString_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 || MapULongLongString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -27825,26 +23217,21 @@ void MapULongLongStringPubSubType::register_type_object_representation() MapULongLongWStringPubSubType::MapULongLongWStringPubSubType() { - setName("MapULongLongWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongWString::getMaxCdrSerializedSize()); -#else - MapULongLongWString_max_cdr_typesize; -#endif + set_name("MapULongLongWString"); + uint32_t type_size = MapULongLongWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongWString_max_key_cdr_typesize > 16 ? MapULongLongWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongWString_max_key_cdr_typesize > 16 ? MapULongLongWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongWStringPubSubType::~MapULongLongWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -27862,12 +23249,10 @@ bool MapULongLongWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -27882,11 +23267,7 @@ bool MapULongLongWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -27903,11 +23284,7 @@ bool MapULongLongWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -27924,52 +23301,43 @@ bool MapULongLongWStringPubSubType::deserialize( return true; } -std::function MapULongLongWStringPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongWStringPubSubType::createData() +void* MapULongLongWStringPubSubType::create_data() { return reinterpret_cast(new MapULongLongWString()); } -void MapULongLongWStringPubSubType::deleteData( +void MapULongLongWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongWStringPubSubType::getKey( +bool MapULongLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -27977,35 +23345,27 @@ bool MapULongLongWStringPubSubType::getKey( const MapULongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongWString_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 || MapULongLongWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28018,26 +23378,21 @@ void MapULongLongWStringPubSubType::register_type_object_representation() MapULongLongInnerAliasBoundedStringHelperPubSubType::MapULongLongInnerAliasBoundedStringHelperPubSubType() { - setName("MapULongLongInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasBoundedStringHelper"); + uint32_t type_size = MapULongLongInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasBoundedStringHelperPubSubType::~MapULongLongInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -28055,12 +23410,10 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -28075,11 +23428,7 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -28096,11 +23445,7 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -28117,52 +23462,43 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasBoundedStringHelperPubSubType::createData() +void* MapULongLongInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasBoundedStringHelper()); } -void MapULongLongInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapULongLongInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -28170,35 +23506,27 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::getKey( const MapULongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasBoundedStringHelper_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 || MapULongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28211,26 +23539,21 @@ void MapULongLongInnerAliasBoundedStringHelperPubSubType::register_type_object_r MapULongLongInnerAliasBoundedWStringHelperPubSubType::MapULongLongInnerAliasBoundedWStringHelperPubSubType() { - setName("MapULongLongInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapULongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasBoundedWStringHelperPubSubType::~MapULongLongInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -28248,12 +23571,10 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -28268,11 +23589,7 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -28289,11 +23606,7 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -28310,52 +23623,43 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapULongLongInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasBoundedWStringHelper()); } -void MapULongLongInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapULongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -28363,35 +23667,27 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::getKey( const MapULongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasBoundedWStringHelper_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 || MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28404,26 +23700,21 @@ void MapULongLongInnerAliasBoundedWStringHelperPubSubType::register_type_object_ MapULongLongInnerEnumHelperPubSubType::MapULongLongInnerEnumHelperPubSubType() { - setName("MapULongLongInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerEnumHelper"); + uint32_t type_size = MapULongLongInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerEnumHelperPubSubType::~MapULongLongInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -28441,12 +23732,10 @@ bool MapULongLongInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -28461,11 +23750,7 @@ bool MapULongLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -28482,11 +23767,7 @@ bool MapULongLongInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -28503,52 +23784,43 @@ bool MapULongLongInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerEnumHelperPubSubType::createData() +void* MapULongLongInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerEnumHelper()); } -void MapULongLongInnerEnumHelperPubSubType::deleteData( +void MapULongLongInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerEnumHelperPubSubType::getKey( +bool MapULongLongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -28556,35 +23828,27 @@ bool MapULongLongInnerEnumHelperPubSubType::getKey( const MapULongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerEnumHelper_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 || MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28597,26 +23861,21 @@ void MapULongLongInnerEnumHelperPubSubType::register_type_object_representation( MapULongLongInnerBitMaskHelperPubSubType::MapULongLongInnerBitMaskHelperPubSubType() { - setName("MapULongLongInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerBitMaskHelper"); + uint32_t type_size = MapULongLongInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerBitMaskHelperPubSubType::~MapULongLongInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -28634,12 +23893,10 @@ bool MapULongLongInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -28654,11 +23911,7 @@ bool MapULongLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -28675,11 +23928,7 @@ bool MapULongLongInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -28696,52 +23945,43 @@ bool MapULongLongInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerBitMaskHelperPubSubType::createData() +void* MapULongLongInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerBitMaskHelper()); } -void MapULongLongInnerBitMaskHelperPubSubType::deleteData( +void MapULongLongInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerBitMaskHelperPubSubType::getKey( +bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -28749,35 +23989,27 @@ bool MapULongLongInnerBitMaskHelperPubSubType::getKey( const MapULongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerBitMaskHelper_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 || MapULongLongInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28790,26 +24022,21 @@ void MapULongLongInnerBitMaskHelperPubSubType::register_type_object_representati MapULongLongInnerAliasHelperPubSubType::MapULongLongInnerAliasHelperPubSubType() { - setName("MapULongLongInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasHelper"); + uint32_t type_size = MapULongLongInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasHelperPubSubType::~MapULongLongInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -28827,12 +24054,10 @@ bool MapULongLongInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -28847,11 +24072,7 @@ bool MapULongLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -28868,11 +24089,7 @@ bool MapULongLongInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -28889,52 +24106,43 @@ bool MapULongLongInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasHelperPubSubType::createData() +void* MapULongLongInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasHelper()); } -void MapULongLongInnerAliasHelperPubSubType::deleteData( +void MapULongLongInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasHelperPubSubType::getKey( +bool MapULongLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -28942,35 +24150,27 @@ bool MapULongLongInnerAliasHelperPubSubType::getKey( const MapULongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasHelper_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 || MapULongLongInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -28983,26 +24183,21 @@ void MapULongLongInnerAliasHelperPubSubType::register_type_object_representation MapULongLongInnerAliasArrayHelperPubSubType::MapULongLongInnerAliasArrayHelperPubSubType() { - setName("MapULongLongInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasArrayHelper"); + uint32_t type_size = MapULongLongInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasArrayHelperPubSubType::~MapULongLongInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29020,12 +24215,10 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -29040,11 +24233,7 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -29061,11 +24250,7 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -29082,52 +24267,43 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasArrayHelperPubSubType::createData() +void* MapULongLongInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasArrayHelper()); } -void MapULongLongInnerAliasArrayHelperPubSubType::deleteData( +void MapULongLongInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasArrayHelperPubSubType::getKey( +bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -29135,35 +24311,27 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::getKey( const MapULongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasArrayHelper_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 || MapULongLongInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -29176,26 +24344,21 @@ void MapULongLongInnerAliasArrayHelperPubSubType::register_type_object_represent MapULongLongInnerAliasSequenceHelperPubSubType::MapULongLongInnerAliasSequenceHelperPubSubType() { - setName("MapULongLongInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasSequenceHelper"); + uint32_t type_size = MapULongLongInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasSequenceHelperPubSubType::~MapULongLongInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29213,12 +24376,10 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -29233,11 +24394,7 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -29254,11 +24411,7 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -29275,52 +24428,43 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasSequenceHelperPubSubType::createData() +void* MapULongLongInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasSequenceHelper()); } -void MapULongLongInnerAliasSequenceHelperPubSubType::deleteData( +void MapULongLongInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasSequenceHelperPubSubType::getKey( +bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -29328,35 +24472,27 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::getKey( const MapULongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasSequenceHelper_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 || MapULongLongInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -29369,26 +24505,21 @@ void MapULongLongInnerAliasSequenceHelperPubSubType::register_type_object_repres MapULongLongInnerAliasMapHelperPubSubType::MapULongLongInnerAliasMapHelperPubSubType() { - setName("MapULongLongInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerAliasMapHelper"); + uint32_t type_size = MapULongLongInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerAliasMapHelperPubSubType::~MapULongLongInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29406,12 +24537,10 @@ bool MapULongLongInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -29426,11 +24555,7 @@ bool MapULongLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -29447,11 +24572,7 @@ bool MapULongLongInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -29468,52 +24589,43 @@ bool MapULongLongInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerAliasMapHelperPubSubType::createData() +void* MapULongLongInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerAliasMapHelper()); } -void MapULongLongInnerAliasMapHelperPubSubType::deleteData( +void MapULongLongInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerAliasMapHelperPubSubType::getKey( +bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -29521,35 +24633,27 @@ bool MapULongLongInnerAliasMapHelperPubSubType::getKey( const MapULongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerAliasMapHelper_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 || MapULongLongInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -29562,26 +24666,21 @@ void MapULongLongInnerAliasMapHelperPubSubType::register_type_object_representat MapULongLongInnerUnionHelperPubSubType::MapULongLongInnerUnionHelperPubSubType() { - setName("MapULongLongInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerUnionHelper"); + uint32_t type_size = MapULongLongInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerUnionHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerUnionHelperPubSubType::~MapULongLongInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29599,12 +24698,10 @@ bool MapULongLongInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -29619,11 +24716,7 @@ bool MapULongLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -29640,11 +24733,7 @@ bool MapULongLongInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -29661,52 +24750,43 @@ bool MapULongLongInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerUnionHelperPubSubType::createData() +void* MapULongLongInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerUnionHelper()); } -void MapULongLongInnerUnionHelperPubSubType::deleteData( +void MapULongLongInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerUnionHelperPubSubType::getKey( +bool MapULongLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -29714,35 +24794,27 @@ bool MapULongLongInnerUnionHelperPubSubType::getKey( const MapULongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerUnionHelper_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 || MapULongLongInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -29755,26 +24827,21 @@ void MapULongLongInnerUnionHelperPubSubType::register_type_object_representation MapULongLongInnerStructureHelperPubSubType::MapULongLongInnerStructureHelperPubSubType() { - setName("MapULongLongInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerStructureHelper"); + uint32_t type_size = MapULongLongInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerStructureHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerStructureHelperPubSubType::~MapULongLongInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29792,12 +24859,10 @@ bool MapULongLongInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -29812,11 +24877,7 @@ bool MapULongLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -29833,11 +24894,7 @@ bool MapULongLongInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -29854,52 +24911,43 @@ bool MapULongLongInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerStructureHelperPubSubType::createData() +void* MapULongLongInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerStructureHelper()); } -void MapULongLongInnerStructureHelperPubSubType::deleteData( +void MapULongLongInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerStructureHelperPubSubType::getKey( +bool MapULongLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -29907,35 +24955,27 @@ bool MapULongLongInnerStructureHelperPubSubType::getKey( const MapULongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerStructureHelper_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 || MapULongLongInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -29948,26 +24988,21 @@ void MapULongLongInnerStructureHelperPubSubType::register_type_object_representa MapULongLongInnerBitsetHelperPubSubType::MapULongLongInnerBitsetHelperPubSubType() { - setName("MapULongLongInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapULongLongInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapULongLongInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapULongLongInnerBitsetHelper"); + uint32_t type_size = MapULongLongInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapULongLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapULongLongInnerBitsetHelperPubSubType::~MapULongLongInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -29985,12 +25020,10 @@ bool MapULongLongInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30005,11 +25038,7 @@ bool MapULongLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30026,11 +25055,7 @@ bool MapULongLongInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -30047,52 +25072,43 @@ bool MapULongLongInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapULongLongInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapULongLongInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapULongLongInnerBitsetHelperPubSubType::createData() +void* MapULongLongInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapULongLongInnerBitsetHelper()); } -void MapULongLongInnerBitsetHelperPubSubType::deleteData( +void MapULongLongInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapULongLongInnerBitsetHelperPubSubType::getKey( +bool MapULongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -30100,35 +25116,27 @@ bool MapULongLongInnerBitsetHelperPubSubType::getKey( const MapULongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapULongLongInnerBitsetHelper_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 || MapULongLongInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -30141,26 +25149,21 @@ void MapULongLongInnerBitsetHelperPubSubType::register_type_object_representatio MapStringShortPubSubType::MapStringShortPubSubType() { - setName("MapStringShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringShort::getMaxCdrSerializedSize()); -#else - MapStringShort_max_cdr_typesize; -#endif + set_name("MapStringShort"); + uint32_t type_size = MapStringShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringShort_max_key_cdr_typesize > 16 ? MapStringShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringShort_max_key_cdr_typesize > 16 ? MapStringShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringShortPubSubType::~MapStringShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -30178,12 +25181,10 @@ bool MapStringShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30198,11 +25199,7 @@ bool MapStringShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30219,11 +25216,7 @@ bool MapStringShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -30240,52 +25233,43 @@ bool MapStringShortPubSubType::deserialize( return true; } -std::function MapStringShortPubSubType::getSerializedSizeProvider( +uint32_t MapStringShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringShortPubSubType::createData() +void* MapStringShortPubSubType::create_data() { return reinterpret_cast(new MapStringShort()); } -void MapStringShortPubSubType::deleteData( +void MapStringShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringShortPubSubType::getKey( +bool MapStringShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -30293,35 +25277,27 @@ bool MapStringShortPubSubType::getKey( const MapStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringShort_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 || MapStringShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -30334,26 +25310,21 @@ void MapStringShortPubSubType::register_type_object_representation() MapStringUShortPubSubType::MapStringUShortPubSubType() { - setName("MapStringUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringUShort::getMaxCdrSerializedSize()); -#else - MapStringUShort_max_cdr_typesize; -#endif + set_name("MapStringUShort"); + uint32_t type_size = MapStringUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringUShort_max_key_cdr_typesize > 16 ? MapStringUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringUShort_max_key_cdr_typesize > 16 ? MapStringUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringUShortPubSubType::~MapStringUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -30371,12 +25342,10 @@ bool MapStringUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30391,11 +25360,7 @@ bool MapStringUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30412,11 +25377,7 @@ bool MapStringUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -30433,52 +25394,43 @@ bool MapStringUShortPubSubType::deserialize( return true; } -std::function MapStringUShortPubSubType::getSerializedSizeProvider( +uint32_t MapStringUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringUShortPubSubType::createData() +void* MapStringUShortPubSubType::create_data() { return reinterpret_cast(new MapStringUShort()); } -void MapStringUShortPubSubType::deleteData( +void MapStringUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringUShortPubSubType::getKey( +bool MapStringUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -30486,35 +25438,27 @@ bool MapStringUShortPubSubType::getKey( const MapStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringUShort_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 || MapStringUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -30527,26 +25471,21 @@ void MapStringUShortPubSubType::register_type_object_representation() MapStringLongPubSubType::MapStringLongPubSubType() { - setName("MapStringLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringLong::getMaxCdrSerializedSize()); -#else - MapStringLong_max_cdr_typesize; -#endif + set_name("MapStringLong"); + uint32_t type_size = MapStringLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringLong_max_key_cdr_typesize > 16 ? MapStringLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringLong_max_key_cdr_typesize > 16 ? MapStringLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringLongPubSubType::~MapStringLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -30564,12 +25503,10 @@ bool MapStringLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30584,11 +25521,7 @@ bool MapStringLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30605,11 +25538,7 @@ bool MapStringLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -30626,52 +25555,43 @@ bool MapStringLongPubSubType::deserialize( return true; } -std::function MapStringLongPubSubType::getSerializedSizeProvider( +uint32_t MapStringLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringLongPubSubType::createData() +void* MapStringLongPubSubType::create_data() { return reinterpret_cast(new MapStringLong()); } -void MapStringLongPubSubType::deleteData( +void MapStringLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringLongPubSubType::getKey( +bool MapStringLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -30679,35 +25599,27 @@ bool MapStringLongPubSubType::getKey( const MapStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringLong_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 || MapStringLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -30720,26 +25632,21 @@ void MapStringLongPubSubType::register_type_object_representation() MapStringULongPubSubType::MapStringULongPubSubType() { - setName("MapStringULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringULong::getMaxCdrSerializedSize()); -#else - MapStringULong_max_cdr_typesize; -#endif + set_name("MapStringULong"); + uint32_t type_size = MapStringULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringULong_max_key_cdr_typesize > 16 ? MapStringULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringULong_max_key_cdr_typesize > 16 ? MapStringULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringULongPubSubType::~MapStringULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -30757,12 +25664,10 @@ bool MapStringULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30777,11 +25682,7 @@ bool MapStringULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30798,11 +25699,7 @@ bool MapStringULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -30819,52 +25716,43 @@ bool MapStringULongPubSubType::deserialize( return true; } -std::function MapStringULongPubSubType::getSerializedSizeProvider( +uint32_t MapStringULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringULongPubSubType::createData() +void* MapStringULongPubSubType::create_data() { return reinterpret_cast(new MapStringULong()); } -void MapStringULongPubSubType::deleteData( +void MapStringULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringULongPubSubType::getKey( +bool MapStringULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -30872,35 +25760,27 @@ bool MapStringULongPubSubType::getKey( const MapStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringULong_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 || MapStringULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -30913,26 +25793,21 @@ void MapStringULongPubSubType::register_type_object_representation() MapStringLongLongPubSubType::MapStringLongLongPubSubType() { - setName("MapStringLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringLongLong::getMaxCdrSerializedSize()); -#else - MapStringLongLong_max_cdr_typesize; -#endif + set_name("MapStringLongLong"); + uint32_t type_size = MapStringLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringLongLong_max_key_cdr_typesize > 16 ? MapStringLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringLongLong_max_key_cdr_typesize > 16 ? MapStringLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringLongLongPubSubType::~MapStringLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -30950,12 +25825,10 @@ bool MapStringLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -30970,11 +25843,7 @@ bool MapStringLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -30991,11 +25860,7 @@ bool MapStringLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31012,52 +25877,43 @@ bool MapStringLongLongPubSubType::deserialize( return true; } -std::function MapStringLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapStringLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringLongLongPubSubType::createData() +void* MapStringLongLongPubSubType::create_data() { return reinterpret_cast(new MapStringLongLong()); } -void MapStringLongLongPubSubType::deleteData( +void MapStringLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringLongLongPubSubType::getKey( +bool MapStringLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -31065,35 +25921,27 @@ bool MapStringLongLongPubSubType::getKey( const MapStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringLongLong_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 || MapStringLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -31106,26 +25954,21 @@ void MapStringLongLongPubSubType::register_type_object_representation() MapStringULongLongPubSubType::MapStringULongLongPubSubType() { - setName("MapStringULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringULongLong::getMaxCdrSerializedSize()); -#else - MapStringULongLong_max_cdr_typesize; -#endif + set_name("MapStringULongLong"); + uint32_t type_size = MapStringULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringULongLong_max_key_cdr_typesize > 16 ? MapStringULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringULongLong_max_key_cdr_typesize > 16 ? MapStringULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringULongLongPubSubType::~MapStringULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -31143,12 +25986,10 @@ bool MapStringULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -31163,11 +26004,7 @@ bool MapStringULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -31184,11 +26021,7 @@ bool MapStringULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31205,52 +26038,43 @@ bool MapStringULongLongPubSubType::deserialize( return true; } -std::function MapStringULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapStringULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringULongLongPubSubType::createData() +void* MapStringULongLongPubSubType::create_data() { return reinterpret_cast(new MapStringULongLong()); } -void MapStringULongLongPubSubType::deleteData( +void MapStringULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringULongLongPubSubType::getKey( +bool MapStringULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -31258,35 +26082,27 @@ bool MapStringULongLongPubSubType::getKey( const MapStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringULongLong_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 || MapStringULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -31299,26 +26115,21 @@ void MapStringULongLongPubSubType::register_type_object_representation() MapStringFloatPubSubType::MapStringFloatPubSubType() { - setName("MapStringFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringFloat::getMaxCdrSerializedSize()); -#else - MapStringFloat_max_cdr_typesize; -#endif + set_name("MapStringFloat"); + uint32_t type_size = MapStringFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringFloat_max_key_cdr_typesize > 16 ? MapStringFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringFloat_max_key_cdr_typesize > 16 ? MapStringFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringFloatPubSubType::~MapStringFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -31336,12 +26147,10 @@ bool MapStringFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -31356,11 +26165,7 @@ bool MapStringFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -31377,11 +26182,7 @@ bool MapStringFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31398,52 +26199,43 @@ bool MapStringFloatPubSubType::deserialize( return true; } -std::function MapStringFloatPubSubType::getSerializedSizeProvider( +uint32_t MapStringFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringFloatPubSubType::createData() +void* MapStringFloatPubSubType::create_data() { return reinterpret_cast(new MapStringFloat()); } -void MapStringFloatPubSubType::deleteData( +void MapStringFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringFloatPubSubType::getKey( +bool MapStringFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -31451,35 +26243,27 @@ bool MapStringFloatPubSubType::getKey( const MapStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringFloat_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 || MapStringFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -31492,26 +26276,21 @@ void MapStringFloatPubSubType::register_type_object_representation() MapStringDoublePubSubType::MapStringDoublePubSubType() { - setName("MapStringDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringDouble::getMaxCdrSerializedSize()); -#else - MapStringDouble_max_cdr_typesize; -#endif + set_name("MapStringDouble"); + uint32_t type_size = MapStringDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringDouble_max_key_cdr_typesize > 16 ? MapStringDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringDouble_max_key_cdr_typesize > 16 ? MapStringDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringDoublePubSubType::~MapStringDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -31529,12 +26308,10 @@ bool MapStringDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -31549,11 +26326,7 @@ bool MapStringDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -31570,11 +26343,7 @@ bool MapStringDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31591,52 +26360,43 @@ bool MapStringDoublePubSubType::deserialize( return true; } -std::function MapStringDoublePubSubType::getSerializedSizeProvider( +uint32_t MapStringDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringDoublePubSubType::createData() +void* MapStringDoublePubSubType::create_data() { return reinterpret_cast(new MapStringDouble()); } -void MapStringDoublePubSubType::deleteData( +void MapStringDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringDoublePubSubType::getKey( +bool MapStringDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -31644,35 +26404,27 @@ bool MapStringDoublePubSubType::getKey( const MapStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringDouble_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 || MapStringDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -31685,26 +26437,21 @@ void MapStringDoublePubSubType::register_type_object_representation() MapStringLongDoublePubSubType::MapStringLongDoublePubSubType() { - setName("MapStringLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringLongDouble::getMaxCdrSerializedSize()); -#else - MapStringLongDouble_max_cdr_typesize; -#endif + set_name("MapStringLongDouble"); + uint32_t type_size = MapStringLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringLongDouble_max_key_cdr_typesize > 16 ? MapStringLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringLongDouble_max_key_cdr_typesize > 16 ? MapStringLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringLongDoublePubSubType::~MapStringLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -31722,12 +26469,10 @@ bool MapStringLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -31742,11 +26487,7 @@ bool MapStringLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -31763,11 +26504,7 @@ bool MapStringLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31784,52 +26521,43 @@ bool MapStringLongDoublePubSubType::deserialize( return true; } -std::function MapStringLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapStringLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringLongDoublePubSubType::createData() +void* MapStringLongDoublePubSubType::create_data() { return reinterpret_cast(new MapStringLongDouble()); } -void MapStringLongDoublePubSubType::deleteData( +void MapStringLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringLongDoublePubSubType::getKey( +bool MapStringLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -31837,35 +26565,27 @@ bool MapStringLongDoublePubSubType::getKey( const MapStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringLongDouble_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 || MapStringLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -31878,26 +26598,21 @@ void MapStringLongDoublePubSubType::register_type_object_representation() MapStringBooleanPubSubType::MapStringBooleanPubSubType() { - setName("MapStringBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringBoolean::getMaxCdrSerializedSize()); -#else - MapStringBoolean_max_cdr_typesize; -#endif + set_name("MapStringBoolean"); + uint32_t type_size = MapStringBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringBoolean_max_key_cdr_typesize > 16 ? MapStringBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringBoolean_max_key_cdr_typesize > 16 ? MapStringBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringBooleanPubSubType::~MapStringBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -31915,12 +26630,10 @@ bool MapStringBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -31935,11 +26648,7 @@ bool MapStringBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -31956,11 +26665,7 @@ bool MapStringBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -31977,52 +26682,43 @@ bool MapStringBooleanPubSubType::deserialize( return true; } -std::function MapStringBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapStringBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringBooleanPubSubType::createData() +void* MapStringBooleanPubSubType::create_data() { return reinterpret_cast(new MapStringBoolean()); } -void MapStringBooleanPubSubType::deleteData( +void MapStringBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringBooleanPubSubType::getKey( +bool MapStringBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32030,35 +26726,27 @@ bool MapStringBooleanPubSubType::getKey( const MapStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringBoolean_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 || MapStringBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -32071,26 +26759,21 @@ void MapStringBooleanPubSubType::register_type_object_representation() MapStringOctetPubSubType::MapStringOctetPubSubType() { - setName("MapStringOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringOctet::getMaxCdrSerializedSize()); -#else - MapStringOctet_max_cdr_typesize; -#endif + set_name("MapStringOctet"); + uint32_t type_size = MapStringOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringOctet_max_key_cdr_typesize > 16 ? MapStringOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringOctet_max_key_cdr_typesize > 16 ? MapStringOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringOctetPubSubType::~MapStringOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -32108,12 +26791,10 @@ bool MapStringOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -32128,11 +26809,7 @@ bool MapStringOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -32149,11 +26826,7 @@ bool MapStringOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -32170,52 +26843,43 @@ bool MapStringOctetPubSubType::deserialize( return true; } -std::function MapStringOctetPubSubType::getSerializedSizeProvider( +uint32_t MapStringOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringOctetPubSubType::createData() +void* MapStringOctetPubSubType::create_data() { return reinterpret_cast(new MapStringOctet()); } -void MapStringOctetPubSubType::deleteData( +void MapStringOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringOctetPubSubType::getKey( +bool MapStringOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32223,35 +26887,27 @@ bool MapStringOctetPubSubType::getKey( const MapStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringOctet_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 || MapStringOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -32264,26 +26920,21 @@ void MapStringOctetPubSubType::register_type_object_representation() MapStringCharPubSubType::MapStringCharPubSubType() { - setName("MapStringChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringChar::getMaxCdrSerializedSize()); -#else - MapStringChar_max_cdr_typesize; -#endif + set_name("MapStringChar"); + uint32_t type_size = MapStringChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringChar_max_key_cdr_typesize > 16 ? MapStringChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringChar_max_key_cdr_typesize > 16 ? MapStringChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringCharPubSubType::~MapStringCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -32301,12 +26952,10 @@ bool MapStringCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -32321,11 +26970,7 @@ bool MapStringCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -32342,11 +26987,7 @@ bool MapStringCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -32363,52 +27004,43 @@ bool MapStringCharPubSubType::deserialize( return true; } -std::function MapStringCharPubSubType::getSerializedSizeProvider( +uint32_t MapStringCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringCharPubSubType::createData() +void* MapStringCharPubSubType::create_data() { return reinterpret_cast(new MapStringChar()); } -void MapStringCharPubSubType::deleteData( +void MapStringCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringCharPubSubType::getKey( +bool MapStringCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32416,35 +27048,27 @@ bool MapStringCharPubSubType::getKey( const MapStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringChar_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 || MapStringChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -32457,26 +27081,21 @@ void MapStringCharPubSubType::register_type_object_representation() MapStringWCharPubSubType::MapStringWCharPubSubType() { - setName("MapStringWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringWChar::getMaxCdrSerializedSize()); -#else - MapStringWChar_max_cdr_typesize; -#endif + set_name("MapStringWChar"); + uint32_t type_size = MapStringWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringWChar_max_key_cdr_typesize > 16 ? MapStringWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringWChar_max_key_cdr_typesize > 16 ? MapStringWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringWCharPubSubType::~MapStringWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -32494,12 +27113,10 @@ bool MapStringWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -32514,11 +27131,7 @@ bool MapStringWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -32535,11 +27148,7 @@ bool MapStringWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -32556,52 +27165,43 @@ bool MapStringWCharPubSubType::deserialize( return true; } -std::function MapStringWCharPubSubType::getSerializedSizeProvider( +uint32_t MapStringWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringWCharPubSubType::createData() +void* MapStringWCharPubSubType::create_data() { return reinterpret_cast(new MapStringWChar()); } -void MapStringWCharPubSubType::deleteData( +void MapStringWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringWCharPubSubType::getKey( +bool MapStringWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32609,35 +27209,27 @@ bool MapStringWCharPubSubType::getKey( const MapStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringWChar_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 || MapStringWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -32650,26 +27242,21 @@ void MapStringWCharPubSubType::register_type_object_representation() MapStringStringPubSubType::MapStringStringPubSubType() { - setName("MapStringString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringString::getMaxCdrSerializedSize()); -#else - MapStringString_max_cdr_typesize; -#endif + set_name("MapStringString"); + uint32_t type_size = MapStringString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringString_max_key_cdr_typesize > 16 ? MapStringString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringString_max_key_cdr_typesize > 16 ? MapStringString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringStringPubSubType::~MapStringStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -32687,12 +27274,10 @@ bool MapStringStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -32707,11 +27292,7 @@ bool MapStringStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -32728,11 +27309,7 @@ bool MapStringStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -32749,52 +27326,43 @@ bool MapStringStringPubSubType::deserialize( return true; } -std::function MapStringStringPubSubType::getSerializedSizeProvider( +uint32_t MapStringStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringStringPubSubType::createData() +void* MapStringStringPubSubType::create_data() { return reinterpret_cast(new MapStringString()); } -void MapStringStringPubSubType::deleteData( +void MapStringStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringStringPubSubType::getKey( +bool MapStringStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32802,35 +27370,27 @@ bool MapStringStringPubSubType::getKey( const MapStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringString_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 || MapStringString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -32843,26 +27403,21 @@ void MapStringStringPubSubType::register_type_object_representation() MapStringWStringPubSubType::MapStringWStringPubSubType() { - setName("MapStringWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringWString::getMaxCdrSerializedSize()); -#else - MapStringWString_max_cdr_typesize; -#endif + set_name("MapStringWString"); + uint32_t type_size = MapStringWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringWString_max_key_cdr_typesize > 16 ? MapStringWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringWString_max_key_cdr_typesize > 16 ? MapStringWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringWStringPubSubType::~MapStringWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -32880,12 +27435,10 @@ bool MapStringWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -32900,11 +27453,7 @@ bool MapStringWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -32921,11 +27470,7 @@ bool MapStringWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -32942,52 +27487,43 @@ bool MapStringWStringPubSubType::deserialize( return true; } -std::function MapStringWStringPubSubType::getSerializedSizeProvider( +uint32_t MapStringWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringWStringPubSubType::createData() +void* MapStringWStringPubSubType::create_data() { return reinterpret_cast(new MapStringWString()); } -void MapStringWStringPubSubType::deleteData( +void MapStringWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringWStringPubSubType::getKey( +bool MapStringWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -32995,35 +27531,27 @@ bool MapStringWStringPubSubType::getKey( const MapStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringWString_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 || MapStringWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -33036,26 +27564,21 @@ void MapStringWStringPubSubType::register_type_object_representation() MapStringInnerAliasBoundedStringHelperPubSubType::MapStringInnerAliasBoundedStringHelperPubSubType() { - setName("MapStringInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasBoundedStringHelper"); + uint32_t type_size = MapStringInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasBoundedStringHelperPubSubType::~MapStringInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -33073,12 +27596,10 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -33093,11 +27614,7 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -33114,11 +27631,7 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -33135,52 +27648,43 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasBoundedStringHelperPubSubType::createData() +void* MapStringInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasBoundedStringHelper()); } -void MapStringInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapStringInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -33188,35 +27692,27 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::getKey( const MapStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasBoundedStringHelper_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 || MapStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -33229,26 +27725,21 @@ void MapStringInnerAliasBoundedStringHelperPubSubType::register_type_object_repr MapStringInnerAliasBoundedWStringHelperPubSubType::MapStringInnerAliasBoundedWStringHelperPubSubType() { - setName("MapStringInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapStringInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasBoundedWStringHelperPubSubType::~MapStringInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -33266,12 +27757,10 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -33286,11 +27775,7 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -33307,11 +27792,7 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -33328,52 +27809,43 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapStringInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasBoundedWStringHelper()); } -void MapStringInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapStringInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -33381,35 +27853,27 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::getKey( const MapStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasBoundedWStringHelper_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 || MapStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -33422,26 +27886,21 @@ void MapStringInnerAliasBoundedWStringHelperPubSubType::register_type_object_rep MapStringInnerEnumHelperPubSubType::MapStringInnerEnumHelperPubSubType() { - setName("MapStringInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerEnumHelper"); + uint32_t type_size = MapStringInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerEnumHelper_max_key_cdr_typesize > 16 ? MapStringInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerEnumHelper_max_key_cdr_typesize > 16 ? MapStringInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerEnumHelperPubSubType::~MapStringInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -33459,12 +27918,10 @@ bool MapStringInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -33479,11 +27936,7 @@ bool MapStringInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -33500,11 +27953,7 @@ bool MapStringInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -33521,52 +27970,43 @@ bool MapStringInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapStringInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerEnumHelperPubSubType::createData() +void* MapStringInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerEnumHelper()); } -void MapStringInnerEnumHelperPubSubType::deleteData( +void MapStringInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerEnumHelperPubSubType::getKey( +bool MapStringInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -33574,35 +28014,27 @@ bool MapStringInnerEnumHelperPubSubType::getKey( const MapStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerEnumHelper_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 || MapStringInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -33615,26 +28047,21 @@ void MapStringInnerEnumHelperPubSubType::register_type_object_representation() MapStringInnerBitMaskHelperPubSubType::MapStringInnerBitMaskHelperPubSubType() { - setName("MapStringInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerBitMaskHelper"); + uint32_t type_size = MapStringInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapStringInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapStringInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerBitMaskHelperPubSubType::~MapStringInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -33652,12 +28079,10 @@ bool MapStringInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -33672,11 +28097,7 @@ bool MapStringInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -33693,11 +28114,7 @@ bool MapStringInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -33714,52 +28131,43 @@ bool MapStringInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapStringInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerBitMaskHelperPubSubType::createData() +void* MapStringInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerBitMaskHelper()); } -void MapStringInnerBitMaskHelperPubSubType::deleteData( +void MapStringInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerBitMaskHelperPubSubType::getKey( +bool MapStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -33767,35 +28175,27 @@ bool MapStringInnerBitMaskHelperPubSubType::getKey( const MapStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerBitMaskHelper_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 || MapStringInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -33808,26 +28208,21 @@ void MapStringInnerBitMaskHelperPubSubType::register_type_object_representation( MapStringInnerAliasHelperPubSubType::MapStringInnerAliasHelperPubSubType() { - setName("MapStringInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasHelper"); + uint32_t type_size = MapStringInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasHelperPubSubType::~MapStringInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -33845,12 +28240,10 @@ bool MapStringInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -33865,11 +28258,7 @@ bool MapStringInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -33886,11 +28275,7 @@ bool MapStringInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -33907,52 +28292,43 @@ bool MapStringInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasHelperPubSubType::createData() +void* MapStringInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasHelper()); } -void MapStringInnerAliasHelperPubSubType::deleteData( +void MapStringInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasHelperPubSubType::getKey( +bool MapStringInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -33960,35 +28336,27 @@ bool MapStringInnerAliasHelperPubSubType::getKey( const MapStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasHelper_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 || MapStringInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34001,26 +28369,21 @@ void MapStringInnerAliasHelperPubSubType::register_type_object_representation() MapStringInnerAliasArrayHelperPubSubType::MapStringInnerAliasArrayHelperPubSubType() { - setName("MapStringInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasArrayHelper"); + uint32_t type_size = MapStringInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasArrayHelperPubSubType::~MapStringInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -34038,12 +28401,10 @@ bool MapStringInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -34058,11 +28419,7 @@ bool MapStringInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -34079,11 +28436,7 @@ bool MapStringInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -34100,52 +28453,43 @@ bool MapStringInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasArrayHelperPubSubType::createData() +void* MapStringInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasArrayHelper()); } -void MapStringInnerAliasArrayHelperPubSubType::deleteData( +void MapStringInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasArrayHelperPubSubType::getKey( +bool MapStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -34153,35 +28497,27 @@ bool MapStringInnerAliasArrayHelperPubSubType::getKey( const MapStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasArrayHelper_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 || MapStringInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34194,26 +28530,21 @@ void MapStringInnerAliasArrayHelperPubSubType::register_type_object_representati MapStringInnerAliasSequenceHelperPubSubType::MapStringInnerAliasSequenceHelperPubSubType() { - setName("MapStringInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasSequenceHelper"); + uint32_t type_size = MapStringInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasSequenceHelperPubSubType::~MapStringInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -34231,12 +28562,10 @@ bool MapStringInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -34251,11 +28580,7 @@ bool MapStringInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -34272,11 +28597,7 @@ bool MapStringInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -34293,52 +28614,43 @@ bool MapStringInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasSequenceHelperPubSubType::createData() +void* MapStringInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasSequenceHelper()); } -void MapStringInnerAliasSequenceHelperPubSubType::deleteData( +void MapStringInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasSequenceHelperPubSubType::getKey( +bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -34346,35 +28658,27 @@ bool MapStringInnerAliasSequenceHelperPubSubType::getKey( const MapStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasSequenceHelper_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 || MapStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34387,26 +28691,21 @@ void MapStringInnerAliasSequenceHelperPubSubType::register_type_object_represent MapStringInnerAliasMapHelperPubSubType::MapStringInnerAliasMapHelperPubSubType() { - setName("MapStringInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerAliasMapHelper"); + uint32_t type_size = MapStringInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerAliasMapHelperPubSubType::~MapStringInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -34424,12 +28723,10 @@ bool MapStringInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -34444,11 +28741,7 @@ bool MapStringInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -34465,11 +28758,7 @@ bool MapStringInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -34486,52 +28775,43 @@ bool MapStringInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapStringInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerAliasMapHelperPubSubType::createData() +void* MapStringInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerAliasMapHelper()); } -void MapStringInnerAliasMapHelperPubSubType::deleteData( +void MapStringInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerAliasMapHelperPubSubType::getKey( +bool MapStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -34539,35 +28819,27 @@ bool MapStringInnerAliasMapHelperPubSubType::getKey( const MapStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerAliasMapHelper_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 || MapStringInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34580,26 +28852,21 @@ void MapStringInnerAliasMapHelperPubSubType::register_type_object_representation MapStringInnerUnionHelperPubSubType::MapStringInnerUnionHelperPubSubType() { - setName("MapStringInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerUnionHelper"); + uint32_t type_size = MapStringInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerUnionHelper_max_key_cdr_typesize > 16 ? MapStringInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerUnionHelper_max_key_cdr_typesize > 16 ? MapStringInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerUnionHelperPubSubType::~MapStringInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -34617,12 +28884,10 @@ bool MapStringInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -34637,11 +28902,7 @@ bool MapStringInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -34658,11 +28919,7 @@ bool MapStringInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -34679,52 +28936,43 @@ bool MapStringInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapStringInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerUnionHelperPubSubType::createData() +void* MapStringInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerUnionHelper()); } -void MapStringInnerUnionHelperPubSubType::deleteData( +void MapStringInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerUnionHelperPubSubType::getKey( +bool MapStringInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -34732,35 +28980,27 @@ bool MapStringInnerUnionHelperPubSubType::getKey( const MapStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerUnionHelper_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 || MapStringInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34773,26 +29013,21 @@ void MapStringInnerUnionHelperPubSubType::register_type_object_representation() MapStringInnerStructureHelperPubSubType::MapStringInnerStructureHelperPubSubType() { - setName("MapStringInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerStructureHelper"); + uint32_t type_size = MapStringInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerStructureHelper_max_key_cdr_typesize > 16 ? MapStringInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerStructureHelper_max_key_cdr_typesize > 16 ? MapStringInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerStructureHelperPubSubType::~MapStringInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -34810,12 +29045,10 @@ bool MapStringInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -34830,11 +29063,7 @@ bool MapStringInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -34851,11 +29080,7 @@ bool MapStringInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -34872,52 +29097,43 @@ bool MapStringInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapStringInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerStructureHelperPubSubType::createData() +void* MapStringInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerStructureHelper()); } -void MapStringInnerStructureHelperPubSubType::deleteData( +void MapStringInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerStructureHelperPubSubType::getKey( +bool MapStringInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -34925,35 +29141,27 @@ bool MapStringInnerStructureHelperPubSubType::getKey( const MapStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerStructureHelper_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 || MapStringInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -34966,26 +29174,21 @@ void MapStringInnerStructureHelperPubSubType::register_type_object_representatio MapStringInnerBitsetHelperPubSubType::MapStringInnerBitsetHelperPubSubType() { - setName("MapStringInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStringInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapStringInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapStringInnerBitsetHelper"); + uint32_t type_size = MapStringInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStringInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapStringInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapStringInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStringInnerBitsetHelperPubSubType::~MapStringInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35003,12 +29206,10 @@ bool MapStringInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35023,11 +29224,7 @@ bool MapStringInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -35044,11 +29241,7 @@ bool MapStringInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -35065,52 +29258,43 @@ bool MapStringInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapStringInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapStringInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStringInnerBitsetHelperPubSubType::createData() +void* MapStringInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapStringInnerBitsetHelper()); } -void MapStringInnerBitsetHelperPubSubType::deleteData( +void MapStringInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStringInnerBitsetHelperPubSubType::getKey( +bool MapStringInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -35118,35 +29302,27 @@ bool MapStringInnerBitsetHelperPubSubType::getKey( const MapStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStringInnerBitsetHelper_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 || MapStringInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -35159,26 +29335,21 @@ void MapStringInnerBitsetHelperPubSubType::register_type_object_representation() MapWStringShortPubSubType::MapWStringShortPubSubType() { - setName("MapWStringShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringShort::getMaxCdrSerializedSize()); -#else - MapWStringShort_max_cdr_typesize; -#endif + set_name("MapWStringShort"); + uint32_t type_size = MapWStringShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringShort_max_key_cdr_typesize > 16 ? MapWStringShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringShort_max_key_cdr_typesize > 16 ? MapWStringShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringShortPubSubType::~MapWStringShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35196,12 +29367,10 @@ bool MapWStringShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35216,11 +29385,7 @@ bool MapWStringShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -35237,11 +29402,7 @@ bool MapWStringShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -35258,52 +29419,43 @@ bool MapWStringShortPubSubType::deserialize( return true; } -std::function MapWStringShortPubSubType::getSerializedSizeProvider( +uint32_t MapWStringShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringShortPubSubType::createData() +void* MapWStringShortPubSubType::create_data() { return reinterpret_cast(new MapWStringShort()); } -void MapWStringShortPubSubType::deleteData( +void MapWStringShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringShortPubSubType::getKey( +bool MapWStringShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -35311,35 +29463,27 @@ bool MapWStringShortPubSubType::getKey( const MapWStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringShort_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 || MapWStringShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -35352,26 +29496,21 @@ void MapWStringShortPubSubType::register_type_object_representation() MapWStringUShortPubSubType::MapWStringUShortPubSubType() { - setName("MapWStringUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringUShort::getMaxCdrSerializedSize()); -#else - MapWStringUShort_max_cdr_typesize; -#endif + set_name("MapWStringUShort"); + uint32_t type_size = MapWStringUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringUShort_max_key_cdr_typesize > 16 ? MapWStringUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringUShort_max_key_cdr_typesize > 16 ? MapWStringUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringUShortPubSubType::~MapWStringUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35389,12 +29528,10 @@ bool MapWStringUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35409,11 +29546,7 @@ bool MapWStringUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -35430,11 +29563,7 @@ bool MapWStringUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -35451,52 +29580,43 @@ bool MapWStringUShortPubSubType::deserialize( return true; } -std::function MapWStringUShortPubSubType::getSerializedSizeProvider( +uint32_t MapWStringUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringUShortPubSubType::createData() +void* MapWStringUShortPubSubType::create_data() { return reinterpret_cast(new MapWStringUShort()); } -void MapWStringUShortPubSubType::deleteData( +void MapWStringUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringUShortPubSubType::getKey( +bool MapWStringUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -35504,35 +29624,27 @@ bool MapWStringUShortPubSubType::getKey( const MapWStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringUShort_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 || MapWStringUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -35545,26 +29657,21 @@ void MapWStringUShortPubSubType::register_type_object_representation() MapWStringLongPubSubType::MapWStringLongPubSubType() { - setName("MapWStringLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringLong::getMaxCdrSerializedSize()); -#else - MapWStringLong_max_cdr_typesize; -#endif + set_name("MapWStringLong"); + uint32_t type_size = MapWStringLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringLong_max_key_cdr_typesize > 16 ? MapWStringLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringLong_max_key_cdr_typesize > 16 ? MapWStringLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringLongPubSubType::~MapWStringLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35582,12 +29689,10 @@ bool MapWStringLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35602,11 +29707,7 @@ bool MapWStringLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -35623,11 +29724,7 @@ bool MapWStringLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -35644,52 +29741,43 @@ bool MapWStringLongPubSubType::deserialize( return true; } -std::function MapWStringLongPubSubType::getSerializedSizeProvider( +uint32_t MapWStringLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringLongPubSubType::createData() +void* MapWStringLongPubSubType::create_data() { return reinterpret_cast(new MapWStringLong()); } -void MapWStringLongPubSubType::deleteData( +void MapWStringLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringLongPubSubType::getKey( +bool MapWStringLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -35697,35 +29785,27 @@ bool MapWStringLongPubSubType::getKey( const MapWStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringLong_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 || MapWStringLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -35738,26 +29818,21 @@ void MapWStringLongPubSubType::register_type_object_representation() MapWStringULongPubSubType::MapWStringULongPubSubType() { - setName("MapWStringULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringULong::getMaxCdrSerializedSize()); -#else - MapWStringULong_max_cdr_typesize; -#endif + set_name("MapWStringULong"); + uint32_t type_size = MapWStringULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringULong_max_key_cdr_typesize > 16 ? MapWStringULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringULong_max_key_cdr_typesize > 16 ? MapWStringULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringULongPubSubType::~MapWStringULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35775,12 +29850,10 @@ bool MapWStringULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35795,11 +29868,7 @@ bool MapWStringULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -35816,11 +29885,7 @@ bool MapWStringULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -35837,52 +29902,43 @@ bool MapWStringULongPubSubType::deserialize( return true; } -std::function MapWStringULongPubSubType::getSerializedSizeProvider( +uint32_t MapWStringULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringULongPubSubType::createData() +void* MapWStringULongPubSubType::create_data() { return reinterpret_cast(new MapWStringULong()); } -void MapWStringULongPubSubType::deleteData( +void MapWStringULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringULongPubSubType::getKey( +bool MapWStringULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -35890,35 +29946,27 @@ bool MapWStringULongPubSubType::getKey( const MapWStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringULong_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 || MapWStringULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -35931,26 +29979,21 @@ void MapWStringULongPubSubType::register_type_object_representation() MapWStringLongLongPubSubType::MapWStringLongLongPubSubType() { - setName("MapWStringLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringLongLong::getMaxCdrSerializedSize()); -#else - MapWStringLongLong_max_cdr_typesize; -#endif + set_name("MapWStringLongLong"); + uint32_t type_size = MapWStringLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringLongLong_max_key_cdr_typesize > 16 ? MapWStringLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringLongLong_max_key_cdr_typesize > 16 ? MapWStringLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringLongLongPubSubType::~MapWStringLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -35968,12 +30011,10 @@ bool MapWStringLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -35988,11 +30029,7 @@ bool MapWStringLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36009,11 +30046,7 @@ bool MapWStringLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36030,52 +30063,43 @@ bool MapWStringLongLongPubSubType::deserialize( return true; } -std::function MapWStringLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapWStringLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringLongLongPubSubType::createData() +void* MapWStringLongLongPubSubType::create_data() { return reinterpret_cast(new MapWStringLongLong()); } -void MapWStringLongLongPubSubType::deleteData( +void MapWStringLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringLongLongPubSubType::getKey( +bool MapWStringLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -36083,35 +30107,27 @@ bool MapWStringLongLongPubSubType::getKey( const MapWStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringLongLong_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 || MapWStringLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -36124,26 +30140,21 @@ void MapWStringLongLongPubSubType::register_type_object_representation() MapWStringULongLongPubSubType::MapWStringULongLongPubSubType() { - setName("MapWStringULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringULongLong::getMaxCdrSerializedSize()); -#else - MapWStringULongLong_max_cdr_typesize; -#endif + set_name("MapWStringULongLong"); + uint32_t type_size = MapWStringULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringULongLong_max_key_cdr_typesize > 16 ? MapWStringULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringULongLong_max_key_cdr_typesize > 16 ? MapWStringULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringULongLongPubSubType::~MapWStringULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -36161,12 +30172,10 @@ bool MapWStringULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -36181,11 +30190,7 @@ bool MapWStringULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36202,11 +30207,7 @@ bool MapWStringULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36223,52 +30224,43 @@ bool MapWStringULongLongPubSubType::deserialize( return true; } -std::function MapWStringULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapWStringULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringULongLongPubSubType::createData() +void* MapWStringULongLongPubSubType::create_data() { return reinterpret_cast(new MapWStringULongLong()); } -void MapWStringULongLongPubSubType::deleteData( +void MapWStringULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringULongLongPubSubType::getKey( +bool MapWStringULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -36276,35 +30268,27 @@ bool MapWStringULongLongPubSubType::getKey( const MapWStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringULongLong_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 || MapWStringULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -36317,26 +30301,21 @@ void MapWStringULongLongPubSubType::register_type_object_representation() MapWStringFloatPubSubType::MapWStringFloatPubSubType() { - setName("MapWStringFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringFloat::getMaxCdrSerializedSize()); -#else - MapWStringFloat_max_cdr_typesize; -#endif + set_name("MapWStringFloat"); + uint32_t type_size = MapWStringFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringFloat_max_key_cdr_typesize > 16 ? MapWStringFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringFloat_max_key_cdr_typesize > 16 ? MapWStringFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringFloatPubSubType::~MapWStringFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -36354,12 +30333,10 @@ bool MapWStringFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -36374,11 +30351,7 @@ bool MapWStringFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36395,11 +30368,7 @@ bool MapWStringFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36416,52 +30385,43 @@ bool MapWStringFloatPubSubType::deserialize( return true; } -std::function MapWStringFloatPubSubType::getSerializedSizeProvider( +uint32_t MapWStringFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringFloatPubSubType::createData() +void* MapWStringFloatPubSubType::create_data() { return reinterpret_cast(new MapWStringFloat()); } -void MapWStringFloatPubSubType::deleteData( +void MapWStringFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringFloatPubSubType::getKey( +bool MapWStringFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -36469,35 +30429,27 @@ bool MapWStringFloatPubSubType::getKey( const MapWStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringFloat_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 || MapWStringFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -36510,26 +30462,21 @@ void MapWStringFloatPubSubType::register_type_object_representation() MapWStringDoublePubSubType::MapWStringDoublePubSubType() { - setName("MapWStringDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringDouble::getMaxCdrSerializedSize()); -#else - MapWStringDouble_max_cdr_typesize; -#endif + set_name("MapWStringDouble"); + uint32_t type_size = MapWStringDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringDouble_max_key_cdr_typesize > 16 ? MapWStringDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringDouble_max_key_cdr_typesize > 16 ? MapWStringDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringDoublePubSubType::~MapWStringDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -36547,12 +30494,10 @@ bool MapWStringDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -36567,11 +30512,7 @@ bool MapWStringDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36588,11 +30529,7 @@ bool MapWStringDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36609,52 +30546,43 @@ bool MapWStringDoublePubSubType::deserialize( return true; } -std::function MapWStringDoublePubSubType::getSerializedSizeProvider( +uint32_t MapWStringDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringDoublePubSubType::createData() +void* MapWStringDoublePubSubType::create_data() { return reinterpret_cast(new MapWStringDouble()); } -void MapWStringDoublePubSubType::deleteData( +void MapWStringDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringDoublePubSubType::getKey( +bool MapWStringDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -36662,35 +30590,27 @@ bool MapWStringDoublePubSubType::getKey( const MapWStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringDouble_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 || MapWStringDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -36703,26 +30623,21 @@ void MapWStringDoublePubSubType::register_type_object_representation() MapWStringLongDoublePubSubType::MapWStringLongDoublePubSubType() { - setName("MapWStringLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringLongDouble::getMaxCdrSerializedSize()); -#else - MapWStringLongDouble_max_cdr_typesize; -#endif + set_name("MapWStringLongDouble"); + uint32_t type_size = MapWStringLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringLongDouble_max_key_cdr_typesize > 16 ? MapWStringLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringLongDouble_max_key_cdr_typesize > 16 ? MapWStringLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringLongDoublePubSubType::~MapWStringLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -36740,12 +30655,10 @@ bool MapWStringLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -36760,11 +30673,7 @@ bool MapWStringLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36781,11 +30690,7 @@ bool MapWStringLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36802,52 +30707,43 @@ bool MapWStringLongDoublePubSubType::deserialize( return true; } -std::function MapWStringLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapWStringLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringLongDoublePubSubType::createData() +void* MapWStringLongDoublePubSubType::create_data() { return reinterpret_cast(new MapWStringLongDouble()); } -void MapWStringLongDoublePubSubType::deleteData( +void MapWStringLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringLongDoublePubSubType::getKey( +bool MapWStringLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -36855,35 +30751,27 @@ bool MapWStringLongDoublePubSubType::getKey( const MapWStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringLongDouble_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 || MapWStringLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -36896,26 +30784,21 @@ void MapWStringLongDoublePubSubType::register_type_object_representation() MapWStringBooleanPubSubType::MapWStringBooleanPubSubType() { - setName("MapWStringBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringBoolean::getMaxCdrSerializedSize()); -#else - MapWStringBoolean_max_cdr_typesize; -#endif + set_name("MapWStringBoolean"); + uint32_t type_size = MapWStringBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringBoolean_max_key_cdr_typesize > 16 ? MapWStringBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringBoolean_max_key_cdr_typesize > 16 ? MapWStringBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringBooleanPubSubType::~MapWStringBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -36933,12 +30816,10 @@ bool MapWStringBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -36953,11 +30834,7 @@ bool MapWStringBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -36974,11 +30851,7 @@ bool MapWStringBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -36995,52 +30868,43 @@ bool MapWStringBooleanPubSubType::deserialize( return true; } -std::function MapWStringBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapWStringBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringBooleanPubSubType::createData() +void* MapWStringBooleanPubSubType::create_data() { return reinterpret_cast(new MapWStringBoolean()); } -void MapWStringBooleanPubSubType::deleteData( +void MapWStringBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringBooleanPubSubType::getKey( +bool MapWStringBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -37048,35 +30912,27 @@ bool MapWStringBooleanPubSubType::getKey( const MapWStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringBoolean_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 || MapWStringBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -37089,26 +30945,21 @@ void MapWStringBooleanPubSubType::register_type_object_representation() MapWStringOctetPubSubType::MapWStringOctetPubSubType() { - setName("MapWStringOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringOctet::getMaxCdrSerializedSize()); -#else - MapWStringOctet_max_cdr_typesize; -#endif + set_name("MapWStringOctet"); + uint32_t type_size = MapWStringOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringOctet_max_key_cdr_typesize > 16 ? MapWStringOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringOctet_max_key_cdr_typesize > 16 ? MapWStringOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringOctetPubSubType::~MapWStringOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -37126,12 +30977,10 @@ bool MapWStringOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -37146,11 +30995,7 @@ bool MapWStringOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -37167,11 +31012,7 @@ bool MapWStringOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -37188,52 +31029,43 @@ bool MapWStringOctetPubSubType::deserialize( return true; } -std::function MapWStringOctetPubSubType::getSerializedSizeProvider( +uint32_t MapWStringOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringOctetPubSubType::createData() +void* MapWStringOctetPubSubType::create_data() { return reinterpret_cast(new MapWStringOctet()); } -void MapWStringOctetPubSubType::deleteData( +void MapWStringOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringOctetPubSubType::getKey( +bool MapWStringOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -37241,35 +31073,27 @@ bool MapWStringOctetPubSubType::getKey( const MapWStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringOctet_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 || MapWStringOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -37282,26 +31106,21 @@ void MapWStringOctetPubSubType::register_type_object_representation() MapWStringCharPubSubType::MapWStringCharPubSubType() { - setName("MapWStringChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringChar::getMaxCdrSerializedSize()); -#else - MapWStringChar_max_cdr_typesize; -#endif + set_name("MapWStringChar"); + uint32_t type_size = MapWStringChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringChar_max_key_cdr_typesize > 16 ? MapWStringChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringChar_max_key_cdr_typesize > 16 ? MapWStringChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringCharPubSubType::~MapWStringCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -37319,12 +31138,10 @@ bool MapWStringCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -37339,11 +31156,7 @@ bool MapWStringCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -37360,11 +31173,7 @@ bool MapWStringCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -37381,52 +31190,43 @@ bool MapWStringCharPubSubType::deserialize( return true; } -std::function MapWStringCharPubSubType::getSerializedSizeProvider( +uint32_t MapWStringCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringCharPubSubType::createData() +void* MapWStringCharPubSubType::create_data() { return reinterpret_cast(new MapWStringChar()); } -void MapWStringCharPubSubType::deleteData( +void MapWStringCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringCharPubSubType::getKey( +bool MapWStringCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -37434,35 +31234,27 @@ bool MapWStringCharPubSubType::getKey( const MapWStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringChar_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 || MapWStringChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -37475,26 +31267,21 @@ void MapWStringCharPubSubType::register_type_object_representation() MapWStringWCharPubSubType::MapWStringWCharPubSubType() { - setName("MapWStringWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringWChar::getMaxCdrSerializedSize()); -#else - MapWStringWChar_max_cdr_typesize; -#endif + set_name("MapWStringWChar"); + uint32_t type_size = MapWStringWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringWChar_max_key_cdr_typesize > 16 ? MapWStringWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringWChar_max_key_cdr_typesize > 16 ? MapWStringWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringWCharPubSubType::~MapWStringWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -37512,12 +31299,10 @@ bool MapWStringWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -37532,11 +31317,7 @@ bool MapWStringWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -37553,11 +31334,7 @@ bool MapWStringWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -37574,52 +31351,43 @@ bool MapWStringWCharPubSubType::deserialize( return true; } -std::function MapWStringWCharPubSubType::getSerializedSizeProvider( +uint32_t MapWStringWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringWCharPubSubType::createData() +void* MapWStringWCharPubSubType::create_data() { return reinterpret_cast(new MapWStringWChar()); } -void MapWStringWCharPubSubType::deleteData( +void MapWStringWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringWCharPubSubType::getKey( +bool MapWStringWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -37627,35 +31395,27 @@ bool MapWStringWCharPubSubType::getKey( const MapWStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringWChar_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 || MapWStringWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -37668,26 +31428,21 @@ void MapWStringWCharPubSubType::register_type_object_representation() MapWStringStringPubSubType::MapWStringStringPubSubType() { - setName("MapWStringString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringString::getMaxCdrSerializedSize()); -#else - MapWStringString_max_cdr_typesize; -#endif + set_name("MapWStringString"); + uint32_t type_size = MapWStringString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringString_max_key_cdr_typesize > 16 ? MapWStringString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringString_max_key_cdr_typesize > 16 ? MapWStringString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringStringPubSubType::~MapWStringStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -37705,12 +31460,10 @@ bool MapWStringStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -37725,11 +31478,7 @@ bool MapWStringStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -37746,11 +31495,7 @@ bool MapWStringStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -37767,52 +31512,43 @@ bool MapWStringStringPubSubType::deserialize( return true; } -std::function MapWStringStringPubSubType::getSerializedSizeProvider( +uint32_t MapWStringStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringStringPubSubType::createData() +void* MapWStringStringPubSubType::create_data() { return reinterpret_cast(new MapWStringString()); } -void MapWStringStringPubSubType::deleteData( +void MapWStringStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringStringPubSubType::getKey( +bool MapWStringStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -37820,35 +31556,27 @@ bool MapWStringStringPubSubType::getKey( const MapWStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringString_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 || MapWStringString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -37861,26 +31589,21 @@ void MapWStringStringPubSubType::register_type_object_representation() MapWStringWStringPubSubType::MapWStringWStringPubSubType() { - setName("MapWStringWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringWString::getMaxCdrSerializedSize()); -#else - MapWStringWString_max_cdr_typesize; -#endif + set_name("MapWStringWString"); + uint32_t type_size = MapWStringWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringWString_max_key_cdr_typesize > 16 ? MapWStringWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringWString_max_key_cdr_typesize > 16 ? MapWStringWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringWStringPubSubType::~MapWStringWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -37898,12 +31621,10 @@ bool MapWStringWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -37918,11 +31639,7 @@ bool MapWStringWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -37939,11 +31656,7 @@ bool MapWStringWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -37960,52 +31673,43 @@ bool MapWStringWStringPubSubType::deserialize( return true; } -std::function MapWStringWStringPubSubType::getSerializedSizeProvider( +uint32_t MapWStringWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringWStringPubSubType::createData() +void* MapWStringWStringPubSubType::create_data() { return reinterpret_cast(new MapWStringWString()); } -void MapWStringWStringPubSubType::deleteData( +void MapWStringWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringWStringPubSubType::getKey( +bool MapWStringWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38013,35 +31717,27 @@ bool MapWStringWStringPubSubType::getKey( const MapWStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringWString_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 || MapWStringWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -38054,26 +31750,21 @@ void MapWStringWStringPubSubType::register_type_object_representation() MapWStringInnerAliasBoundedStringHelperPubSubType::MapWStringInnerAliasBoundedStringHelperPubSubType() { - setName("MapWStringInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasBoundedStringHelper"); + uint32_t type_size = MapWStringInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasBoundedStringHelperPubSubType::~MapWStringInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -38091,12 +31782,10 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -38111,11 +31800,7 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -38132,11 +31817,7 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -38153,52 +31834,43 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasBoundedStringHelperPubSubType::createData() +void* MapWStringInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasBoundedStringHelper()); } -void MapWStringInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapWStringInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38206,35 +31878,27 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::getKey( const MapWStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasBoundedStringHelper_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 || MapWStringInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -38247,26 +31911,21 @@ void MapWStringInnerAliasBoundedStringHelperPubSubType::register_type_object_rep MapWStringInnerAliasBoundedWStringHelperPubSubType::MapWStringInnerAliasBoundedWStringHelperPubSubType() { - setName("MapWStringInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapWStringInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasBoundedWStringHelperPubSubType::~MapWStringInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -38284,12 +31943,10 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -38304,11 +31961,7 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -38325,11 +31978,7 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -38346,52 +31995,43 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapWStringInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasBoundedWStringHelper()); } -void MapWStringInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapWStringInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38399,35 +32039,27 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::getKey( const MapWStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasBoundedWStringHelper_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 || MapWStringInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -38440,26 +32072,21 @@ void MapWStringInnerAliasBoundedWStringHelperPubSubType::register_type_object_re MapWStringInnerEnumHelperPubSubType::MapWStringInnerEnumHelperPubSubType() { - setName("MapWStringInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerEnumHelper"); + uint32_t type_size = MapWStringInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerEnumHelper_max_key_cdr_typesize > 16 ? MapWStringInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerEnumHelper_max_key_cdr_typesize > 16 ? MapWStringInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerEnumHelperPubSubType::~MapWStringInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -38477,12 +32104,10 @@ bool MapWStringInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -38497,11 +32122,7 @@ bool MapWStringInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -38518,11 +32139,7 @@ bool MapWStringInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -38539,52 +32156,43 @@ bool MapWStringInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerEnumHelperPubSubType::createData() +void* MapWStringInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerEnumHelper()); } -void MapWStringInnerEnumHelperPubSubType::deleteData( +void MapWStringInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerEnumHelperPubSubType::getKey( +bool MapWStringInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38592,35 +32200,27 @@ bool MapWStringInnerEnumHelperPubSubType::getKey( const MapWStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerEnumHelper_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 || MapWStringInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -38633,26 +32233,21 @@ void MapWStringInnerEnumHelperPubSubType::register_type_object_representation() MapWStringInnerBitMaskHelperPubSubType::MapWStringInnerBitMaskHelperPubSubType() { - setName("MapWStringInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerBitMaskHelper"); + uint32_t type_size = MapWStringInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapWStringInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapWStringInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerBitMaskHelperPubSubType::~MapWStringInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -38670,12 +32265,10 @@ bool MapWStringInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -38690,11 +32283,7 @@ bool MapWStringInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -38711,11 +32300,7 @@ bool MapWStringInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -38732,52 +32317,43 @@ bool MapWStringInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerBitMaskHelperPubSubType::createData() +void* MapWStringInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerBitMaskHelper()); } -void MapWStringInnerBitMaskHelperPubSubType::deleteData( +void MapWStringInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerBitMaskHelperPubSubType::getKey( +bool MapWStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38785,35 +32361,27 @@ bool MapWStringInnerBitMaskHelperPubSubType::getKey( const MapWStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerBitMaskHelper_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 || MapWStringInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -38826,26 +32394,21 @@ void MapWStringInnerBitMaskHelperPubSubType::register_type_object_representation MapWStringInnerAliasHelperPubSubType::MapWStringInnerAliasHelperPubSubType() { - setName("MapWStringInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasHelper"); + uint32_t type_size = MapWStringInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasHelperPubSubType::~MapWStringInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -38863,12 +32426,10 @@ bool MapWStringInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -38883,11 +32444,7 @@ bool MapWStringInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -38904,11 +32461,7 @@ bool MapWStringInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -38925,52 +32478,43 @@ bool MapWStringInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasHelperPubSubType::createData() +void* MapWStringInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasHelper()); } -void MapWStringInnerAliasHelperPubSubType::deleteData( +void MapWStringInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasHelperPubSubType::getKey( +bool MapWStringInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -38978,35 +32522,27 @@ bool MapWStringInnerAliasHelperPubSubType::getKey( const MapWStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasHelper_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 || MapWStringInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39019,26 +32555,21 @@ void MapWStringInnerAliasHelperPubSubType::register_type_object_representation() MapWStringInnerAliasArrayHelperPubSubType::MapWStringInnerAliasArrayHelperPubSubType() { - setName("MapWStringInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasArrayHelper"); + uint32_t type_size = MapWStringInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasArrayHelperPubSubType::~MapWStringInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -39056,12 +32587,10 @@ bool MapWStringInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -39076,11 +32605,7 @@ bool MapWStringInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -39097,11 +32622,7 @@ bool MapWStringInnerAliasArrayHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -39118,52 +32639,43 @@ bool MapWStringInnerAliasArrayHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasArrayHelperPubSubType::createData() +void* MapWStringInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasArrayHelper()); } -void MapWStringInnerAliasArrayHelperPubSubType::deleteData( +void MapWStringInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasArrayHelperPubSubType::getKey( +bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -39171,35 +32683,27 @@ bool MapWStringInnerAliasArrayHelperPubSubType::getKey( const MapWStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasArrayHelper_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 || MapWStringInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39212,26 +32716,21 @@ void MapWStringInnerAliasArrayHelperPubSubType::register_type_object_representat MapWStringInnerAliasSequenceHelperPubSubType::MapWStringInnerAliasSequenceHelperPubSubType() { - setName("MapWStringInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasSequenceHelper"); + uint32_t type_size = MapWStringInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasSequenceHelperPubSubType::~MapWStringInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -39249,12 +32748,10 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -39269,11 +32766,7 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -39290,11 +32783,7 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -39311,52 +32800,43 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasSequenceHelperPubSubType::createData() +void* MapWStringInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasSequenceHelper()); } -void MapWStringInnerAliasSequenceHelperPubSubType::deleteData( +void MapWStringInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasSequenceHelperPubSubType::getKey( +bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -39364,35 +32844,27 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::getKey( const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasSequenceHelper_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 || MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39405,26 +32877,21 @@ void MapWStringInnerAliasSequenceHelperPubSubType::register_type_object_represen MapWStringInnerAliasMapHelperPubSubType::MapWStringInnerAliasMapHelperPubSubType() { - setName("MapWStringInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerAliasMapHelper"); + uint32_t type_size = MapWStringInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerAliasMapHelperPubSubType::~MapWStringInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -39442,12 +32909,10 @@ bool MapWStringInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -39462,11 +32927,7 @@ bool MapWStringInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -39483,11 +32944,7 @@ bool MapWStringInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -39504,52 +32961,43 @@ bool MapWStringInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerAliasMapHelperPubSubType::createData() +void* MapWStringInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerAliasMapHelper()); } -void MapWStringInnerAliasMapHelperPubSubType::deleteData( +void MapWStringInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerAliasMapHelperPubSubType::getKey( +bool MapWStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -39557,35 +33005,27 @@ bool MapWStringInnerAliasMapHelperPubSubType::getKey( const MapWStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerAliasMapHelper_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 || MapWStringInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39598,26 +33038,21 @@ void MapWStringInnerAliasMapHelperPubSubType::register_type_object_representatio MapWStringInnerUnionHelperPubSubType::MapWStringInnerUnionHelperPubSubType() { - setName("MapWStringInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerUnionHelper"); + uint32_t type_size = MapWStringInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerUnionHelper_max_key_cdr_typesize > 16 ? MapWStringInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerUnionHelper_max_key_cdr_typesize > 16 ? MapWStringInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerUnionHelperPubSubType::~MapWStringInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -39635,12 +33070,10 @@ bool MapWStringInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -39655,11 +33088,7 @@ bool MapWStringInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -39676,11 +33105,7 @@ bool MapWStringInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -39697,52 +33122,43 @@ bool MapWStringInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerUnionHelperPubSubType::createData() +void* MapWStringInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerUnionHelper()); } -void MapWStringInnerUnionHelperPubSubType::deleteData( +void MapWStringInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerUnionHelperPubSubType::getKey( +bool MapWStringInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -39750,35 +33166,27 @@ bool MapWStringInnerUnionHelperPubSubType::getKey( const MapWStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerUnionHelper_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 || MapWStringInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39791,26 +33199,21 @@ void MapWStringInnerUnionHelperPubSubType::register_type_object_representation() MapWStringInnerStructureHelperPubSubType::MapWStringInnerStructureHelperPubSubType() { - setName("MapWStringInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerStructureHelper"); + uint32_t type_size = MapWStringInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerStructureHelper_max_key_cdr_typesize > 16 ? MapWStringInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerStructureHelper_max_key_cdr_typesize > 16 ? MapWStringInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerStructureHelperPubSubType::~MapWStringInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -39828,12 +33231,10 @@ bool MapWStringInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -39848,11 +33249,7 @@ bool MapWStringInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -39869,11 +33266,7 @@ bool MapWStringInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -39890,52 +33283,43 @@ bool MapWStringInnerStructureHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerStructureHelperPubSubType::createData() +void* MapWStringInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerStructureHelper()); } -void MapWStringInnerStructureHelperPubSubType::deleteData( +void MapWStringInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerStructureHelperPubSubType::getKey( +bool MapWStringInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -39943,35 +33327,27 @@ bool MapWStringInnerStructureHelperPubSubType::getKey( const MapWStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerStructureHelper_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 || MapWStringInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -39984,26 +33360,21 @@ void MapWStringInnerStructureHelperPubSubType::register_type_object_representati MapWStringInnerBitsetHelperPubSubType::MapWStringInnerBitsetHelperPubSubType() { - setName("MapWStringInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapWStringInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapWStringInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapWStringInnerBitsetHelper"); + uint32_t type_size = MapWStringInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapWStringInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapWStringInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapWStringInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapWStringInnerBitsetHelperPubSubType::~MapWStringInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40021,12 +33392,10 @@ bool MapWStringInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -40041,11 +33410,7 @@ bool MapWStringInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -40062,11 +33427,7 @@ bool MapWStringInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -40083,52 +33444,43 @@ bool MapWStringInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapWStringInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapWStringInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapWStringInnerBitsetHelperPubSubType::createData() +void* MapWStringInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapWStringInnerBitsetHelper()); } -void MapWStringInnerBitsetHelperPubSubType::deleteData( +void MapWStringInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapWStringInnerBitsetHelperPubSubType::getKey( +bool MapWStringInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -40136,35 +33488,27 @@ bool MapWStringInnerBitsetHelperPubSubType::getKey( const MapWStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapWStringInnerBitsetHelper_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 || MapWStringInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -40177,26 +33521,21 @@ void MapWStringInnerBitsetHelperPubSubType::register_type_object_representation( MapInnerAliasBoundedStringHelperShortPubSubType::MapInnerAliasBoundedStringHelperShortPubSubType() { - setName("MapInnerAliasBoundedStringHelperShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperShort::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperShort_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperShort"); + uint32_t type_size = MapInnerAliasBoundedStringHelperShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperShortPubSubType::~MapInnerAliasBoundedStringHelperShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40214,12 +33553,10 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -40234,11 +33571,7 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -40255,11 +33588,7 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -40276,52 +33605,43 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperShortPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperShortPubSubType::createData() +void* MapInnerAliasBoundedStringHelperShortPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperShort()); } -void MapInnerAliasBoundedStringHelperShortPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperShortPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -40329,35 +33649,27 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::getKey( const MapInnerAliasBoundedStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperShort_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 || MapInnerAliasBoundedStringHelperShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -40370,26 +33682,21 @@ void MapInnerAliasBoundedStringHelperShortPubSubType::register_type_object_repre MapInnerAliasBoundedStringHelperUShortPubSubType::MapInnerAliasBoundedStringHelperUShortPubSubType() { - setName("MapInnerAliasBoundedStringHelperUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperUShort::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperUShort_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperUShort"); + uint32_t type_size = MapInnerAliasBoundedStringHelperUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperUShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperUShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperUShortPubSubType::~MapInnerAliasBoundedStringHelperUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40407,12 +33714,10 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -40427,11 +33732,7 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -40448,11 +33749,7 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -40469,52 +33766,43 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperUShortPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperUShortPubSubType::createData() +void* MapInnerAliasBoundedStringHelperUShortPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperUShort()); } -void MapInnerAliasBoundedStringHelperUShortPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperUShortPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -40522,35 +33810,27 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::getKey( const MapInnerAliasBoundedStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperUShort_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 || MapInnerAliasBoundedStringHelperUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -40563,26 +33843,21 @@ void MapInnerAliasBoundedStringHelperUShortPubSubType::register_type_object_repr MapInnerAliasBoundedStringHelperLongPubSubType::MapInnerAliasBoundedStringHelperLongPubSubType() { - setName("MapInnerAliasBoundedStringHelperLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperLong"); + uint32_t type_size = MapInnerAliasBoundedStringHelperLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperLongPubSubType::~MapInnerAliasBoundedStringHelperLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40600,12 +33875,10 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -40620,11 +33893,7 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -40641,11 +33910,7 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -40662,52 +33927,43 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperLongPubSubType::createData() +void* MapInnerAliasBoundedStringHelperLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperLong()); } -void MapInnerAliasBoundedStringHelperLongPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperLongPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -40715,35 +33971,27 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::getKey( const MapInnerAliasBoundedStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperLong_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 || MapInnerAliasBoundedStringHelperLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -40756,26 +34004,21 @@ void MapInnerAliasBoundedStringHelperLongPubSubType::register_type_object_repres MapInnerAliasBoundedStringHelperULongPubSubType::MapInnerAliasBoundedStringHelperULongPubSubType() { - setName("MapInnerAliasBoundedStringHelperULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperULong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperULong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperULong"); + uint32_t type_size = MapInnerAliasBoundedStringHelperULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperULong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperULong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperULongPubSubType::~MapInnerAliasBoundedStringHelperULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40793,12 +34036,10 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -40813,11 +34054,7 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -40834,11 +34071,7 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -40855,52 +34088,43 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperULongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperULongPubSubType::createData() +void* MapInnerAliasBoundedStringHelperULongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperULong()); } -void MapInnerAliasBoundedStringHelperULongPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperULongPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -40908,35 +34132,27 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::getKey( const MapInnerAliasBoundedStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperULong_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 || MapInnerAliasBoundedStringHelperULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -40949,26 +34165,21 @@ void MapInnerAliasBoundedStringHelperULongPubSubType::register_type_object_repre MapInnerAliasBoundedStringHelperLongLongPubSubType::MapInnerAliasBoundedStringHelperLongLongPubSubType() { - setName("MapInnerAliasBoundedStringHelperLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperLongLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperLongLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperLongLong"); + uint32_t type_size = MapInnerAliasBoundedStringHelperLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperLongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperLongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperLongLongPubSubType::~MapInnerAliasBoundedStringHelperLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -40986,12 +34197,10 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41006,11 +34215,7 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41027,11 +34232,7 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -41048,52 +34249,43 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperLongLongPubSubType::createData() +void* MapInnerAliasBoundedStringHelperLongLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperLongLong()); } -void MapInnerAliasBoundedStringHelperLongLongPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperLongLongPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -41101,35 +34293,27 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::getKey( const MapInnerAliasBoundedStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperLongLong_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 || MapInnerAliasBoundedStringHelperLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -41142,26 +34326,21 @@ void MapInnerAliasBoundedStringHelperLongLongPubSubType::register_type_object_re MapInnerAliasBoundedStringHelperULongLongPubSubType::MapInnerAliasBoundedStringHelperULongLongPubSubType() { - setName("MapInnerAliasBoundedStringHelperULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperULongLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperULongLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperULongLong"); + uint32_t type_size = MapInnerAliasBoundedStringHelperULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperULongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperULongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperULongLongPubSubType::~MapInnerAliasBoundedStringHelperULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -41179,12 +34358,10 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41199,11 +34376,7 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41220,11 +34393,7 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -41241,52 +34410,43 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperULongLongPubSubType::createData() +void* MapInnerAliasBoundedStringHelperULongLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperULongLong()); } -void MapInnerAliasBoundedStringHelperULongLongPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperULongLongPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -41294,35 +34454,27 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::getKey( const MapInnerAliasBoundedStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperULongLong_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 || MapInnerAliasBoundedStringHelperULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -41335,26 +34487,21 @@ void MapInnerAliasBoundedStringHelperULongLongPubSubType::register_type_object_r MapInnerAliasBoundedStringHelperFloatPubSubType::MapInnerAliasBoundedStringHelperFloatPubSubType() { - setName("MapInnerAliasBoundedStringHelperFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperFloat::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperFloat_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperFloat"); + uint32_t type_size = MapInnerAliasBoundedStringHelperFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperFloat_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperFloat_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperFloatPubSubType::~MapInnerAliasBoundedStringHelperFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -41372,12 +34519,10 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41392,11 +34537,7 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41413,11 +34554,7 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -41434,52 +34571,43 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperFloatPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperFloatPubSubType::createData() +void* MapInnerAliasBoundedStringHelperFloatPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperFloat()); } -void MapInnerAliasBoundedStringHelperFloatPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperFloatPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -41487,35 +34615,27 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::getKey( const MapInnerAliasBoundedStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperFloat_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 || MapInnerAliasBoundedStringHelperFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -41528,26 +34648,21 @@ void MapInnerAliasBoundedStringHelperFloatPubSubType::register_type_object_repre MapInnerAliasBoundedStringHelperDoublePubSubType::MapInnerAliasBoundedStringHelperDoublePubSubType() { - setName("MapInnerAliasBoundedStringHelperDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperDouble::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperDouble_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperDouble"); + uint32_t type_size = MapInnerAliasBoundedStringHelperDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperDoublePubSubType::~MapInnerAliasBoundedStringHelperDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -41565,12 +34680,10 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41585,11 +34698,7 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41606,11 +34715,7 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -41627,52 +34732,43 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperDoublePubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperDoublePubSubType::createData() +void* MapInnerAliasBoundedStringHelperDoublePubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperDouble()); } -void MapInnerAliasBoundedStringHelperDoublePubSubType::deleteData( +void MapInnerAliasBoundedStringHelperDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperDoublePubSubType::getKey( +bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -41680,35 +34776,27 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::getKey( const MapInnerAliasBoundedStringHelperDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperDouble_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 || MapInnerAliasBoundedStringHelperDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -41721,26 +34809,21 @@ void MapInnerAliasBoundedStringHelperDoublePubSubType::register_type_object_repr MapInnerAliasBoundedStringHelperLongDoublePubSubType::MapInnerAliasBoundedStringHelperLongDoublePubSubType() { - setName("MapInnerAliasBoundedStringHelperLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperLongDouble::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperLongDouble_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperLongDouble"); + uint32_t type_size = MapInnerAliasBoundedStringHelperLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperLongDoublePubSubType::~MapInnerAliasBoundedStringHelperLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -41758,12 +34841,10 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41778,11 +34859,7 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41799,11 +34876,7 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -41820,52 +34893,43 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperLongDoublePubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperLongDoublePubSubType::createData() +void* MapInnerAliasBoundedStringHelperLongDoublePubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperLongDouble()); } -void MapInnerAliasBoundedStringHelperLongDoublePubSubType::deleteData( +void MapInnerAliasBoundedStringHelperLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::getKey( +bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -41873,35 +34937,27 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::getKey( const MapInnerAliasBoundedStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperLongDouble_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 || MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -41914,26 +34970,21 @@ void MapInnerAliasBoundedStringHelperLongDoublePubSubType::register_type_object_ MapInnerAliasBoundedStringHelperBooleanPubSubType::MapInnerAliasBoundedStringHelperBooleanPubSubType() { - setName("MapInnerAliasBoundedStringHelperBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperBoolean::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperBoolean_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperBoolean"); + uint32_t type_size = MapInnerAliasBoundedStringHelperBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperBooleanPubSubType::~MapInnerAliasBoundedStringHelperBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -41951,12 +35002,10 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -41971,11 +35020,7 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -41992,11 +35037,7 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42013,52 +35054,43 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperBooleanPubSubType::createData() +void* MapInnerAliasBoundedStringHelperBooleanPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperBoolean()); } -void MapInnerAliasBoundedStringHelperBooleanPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperBooleanPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -42066,35 +35098,27 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::getKey( const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperBoolean_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 || MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -42107,26 +35131,21 @@ void MapInnerAliasBoundedStringHelperBooleanPubSubType::register_type_object_rep MapInnerAliasBoundedStringHelperOctetPubSubType::MapInnerAliasBoundedStringHelperOctetPubSubType() { - setName("MapInnerAliasBoundedStringHelperOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperOctet::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperOctet_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperOctet"); + uint32_t type_size = MapInnerAliasBoundedStringHelperOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperOctetPubSubType::~MapInnerAliasBoundedStringHelperOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -42144,12 +35163,10 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -42164,11 +35181,7 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -42185,11 +35198,7 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42206,52 +35215,43 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperOctetPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperOctetPubSubType::createData() +void* MapInnerAliasBoundedStringHelperOctetPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperOctet()); } -void MapInnerAliasBoundedStringHelperOctetPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperOctetPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -42259,35 +35259,27 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::getKey( const MapInnerAliasBoundedStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperOctet_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 || MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -42300,26 +35292,21 @@ void MapInnerAliasBoundedStringHelperOctetPubSubType::register_type_object_repre MapInnerAliasBoundedStringHelperCharPubSubType::MapInnerAliasBoundedStringHelperCharPubSubType() { - setName("MapInnerAliasBoundedStringHelperChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperChar::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperChar_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperChar"); + uint32_t type_size = MapInnerAliasBoundedStringHelperChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperCharPubSubType::~MapInnerAliasBoundedStringHelperCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -42337,12 +35324,10 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -42357,11 +35342,7 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -42378,11 +35359,7 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42399,52 +35376,43 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperCharPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperCharPubSubType::createData() +void* MapInnerAliasBoundedStringHelperCharPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperChar()); } -void MapInnerAliasBoundedStringHelperCharPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperCharPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -42452,35 +35420,27 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::getKey( const MapInnerAliasBoundedStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperChar_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 || MapInnerAliasBoundedStringHelperChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -42493,26 +35453,21 @@ void MapInnerAliasBoundedStringHelperCharPubSubType::register_type_object_repres MapInnerAliasBoundedStringHelperWCharPubSubType::MapInnerAliasBoundedStringHelperWCharPubSubType() { - setName("MapInnerAliasBoundedStringHelperWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperWChar::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperWChar_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperWChar"); + uint32_t type_size = MapInnerAliasBoundedStringHelperWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperWChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperWChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperWCharPubSubType::~MapInnerAliasBoundedStringHelperWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -42530,12 +35485,10 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -42550,11 +35503,7 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -42571,11 +35520,7 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42592,52 +35537,43 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperWCharPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperWCharPubSubType::createData() +void* MapInnerAliasBoundedStringHelperWCharPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperWChar()); } -void MapInnerAliasBoundedStringHelperWCharPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperWCharPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -42645,35 +35581,27 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::getKey( const MapInnerAliasBoundedStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperWChar_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 || MapInnerAliasBoundedStringHelperWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -42686,26 +35614,21 @@ void MapInnerAliasBoundedStringHelperWCharPubSubType::register_type_object_repre MapInnerAliasBoundedStringHelperStringPubSubType::MapInnerAliasBoundedStringHelperStringPubSubType() { - setName("MapInnerAliasBoundedStringHelperString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperString::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperString_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperString"); + uint32_t type_size = MapInnerAliasBoundedStringHelperString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperStringPubSubType::~MapInnerAliasBoundedStringHelperStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -42723,12 +35646,10 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -42743,11 +35664,7 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -42764,11 +35681,7 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42785,52 +35698,43 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperStringPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperStringPubSubType::createData() +void* MapInnerAliasBoundedStringHelperStringPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperString()); } -void MapInnerAliasBoundedStringHelperStringPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperStringPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -42838,35 +35742,27 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::getKey( const MapInnerAliasBoundedStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperString_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 || MapInnerAliasBoundedStringHelperString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -42879,26 +35775,21 @@ void MapInnerAliasBoundedStringHelperStringPubSubType::register_type_object_repr MapInnerAliasBoundedStringHelperWStringPubSubType::MapInnerAliasBoundedStringHelperWStringPubSubType() { - setName("MapInnerAliasBoundedStringHelperWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperWString::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperWString_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperWString"); + uint32_t type_size = MapInnerAliasBoundedStringHelperWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperWString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperWString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperWStringPubSubType::~MapInnerAliasBoundedStringHelperWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -42916,12 +35807,10 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -42936,11 +35825,7 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -42957,11 +35842,7 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -42978,52 +35859,43 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperWStringPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperWStringPubSubType::createData() +void* MapInnerAliasBoundedStringHelperWStringPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperWString()); } -void MapInnerAliasBoundedStringHelperWStringPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperWStringPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43031,35 +35903,27 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::getKey( const MapInnerAliasBoundedStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperWString_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 || MapInnerAliasBoundedStringHelperWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -43072,26 +35936,21 @@ void MapInnerAliasBoundedStringHelperWStringPubSubType::register_type_object_rep MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -43109,12 +35968,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::se data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -43129,11 +35986,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::se } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -43150,11 +36003,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::de eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -43171,52 +36020,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::de return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43224,35 +36064,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::ge const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -43265,26 +36097,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::re MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -43302,12 +36129,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::s data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -43322,11 +36147,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::s } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -43343,11 +36164,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::d eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -43364,52 +36181,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::d return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43417,35 +36225,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::g const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -43458,26 +36258,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::r MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerEnumHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerEnumHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerEnumHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -43495,12 +36290,10 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -43515,11 +36308,7 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -43536,11 +36325,7 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -43557,52 +36342,43 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerEnumHelper()); } -void MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43610,35 +36386,27 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerEnumHelper_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 || MapInnerAliasBoundedStringHelperInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -43651,26 +36419,21 @@ void MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::register_type_ob MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerBitMaskHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -43688,12 +36451,10 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -43708,11 +36469,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -43729,11 +36486,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -43750,52 +36503,43 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerBitMaskHelper()); } -void MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43803,35 +36547,27 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerBitMaskHelper_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 || MapInnerAliasBoundedStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -43844,26 +36580,21 @@ void MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::register_type MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -43881,12 +36612,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -43901,11 +36630,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -43922,11 +36647,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -43943,52 +36664,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -43996,35 +36708,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -44037,26 +36741,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::register_type_o MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasArrayHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -44074,12 +36773,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -44094,11 +36791,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -44115,11 +36808,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::deserializ eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -44136,52 +36825,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::deserializ return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasArrayHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -44189,35 +36869,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -44230,26 +36902,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::register_t MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -44267,12 +36934,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::seriali data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -44287,11 +36952,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::seriali } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -44308,11 +36969,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::deseria eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -44329,52 +36986,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::deseria return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -44382,35 +37030,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -44423,26 +37063,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::registe MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerAliasMapHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -44460,12 +37095,10 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -44480,11 +37113,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -44501,11 +37130,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -44522,52 +37147,43 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerAliasMapHelper()); } -void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -44575,35 +37191,27 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerAliasMapHelper_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 || MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -44616,26 +37224,21 @@ void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::register_typ MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerUnionHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -44653,12 +37256,10 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -44673,11 +37274,7 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -44694,11 +37291,7 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -44715,52 +37308,43 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerUnionHelper()); } -void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -44768,35 +37352,27 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerUnionHelper_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 || MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -44809,26 +37385,21 @@ void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::register_type_o MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerStructureHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -44846,12 +37417,10 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -44866,11 +37435,7 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -44887,11 +37452,7 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::deserialize eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -44908,52 +37469,43 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::deserialize return true; } -std::function MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerStructureHelper()); } -void MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -44961,35 +37513,27 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerStructureHelper_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 || MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45002,26 +37546,21 @@ void MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::register_ty MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType() { - setName("MapInnerAliasBoundedStringHelperInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedStringHelperInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedStringHelperInnerBitsetHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -45039,12 +37578,10 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -45059,11 +37596,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -45080,11 +37613,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -45101,52 +37630,43 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::createData() +void* MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerBitsetHelper()); } -void MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::deleteData( +void MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::getKey( +bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -45154,35 +37674,27 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::getKey( const MapInnerAliasBoundedStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedStringHelperInnerBitsetHelper_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 || MapInnerAliasBoundedStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45195,26 +37707,21 @@ void MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::register_type_ MapInnerAliasBoundedWStringHelperShortPubSubType::MapInnerAliasBoundedWStringHelperShortPubSubType() { - setName("MapInnerAliasBoundedWStringHelperShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperShort::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperShort_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperShort"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperShortPubSubType::~MapInnerAliasBoundedWStringHelperShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -45232,12 +37739,10 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -45252,11 +37757,7 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -45273,11 +37774,7 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -45294,52 +37791,43 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperShortPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperShortPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperShortPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperShort()); } -void MapInnerAliasBoundedWStringHelperShortPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperShortPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -45347,35 +37835,27 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::getKey( const MapInnerAliasBoundedWStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperShort_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 || MapInnerAliasBoundedWStringHelperShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45388,26 +37868,21 @@ void MapInnerAliasBoundedWStringHelperShortPubSubType::register_type_object_repr MapInnerAliasBoundedWStringHelperUShortPubSubType::MapInnerAliasBoundedWStringHelperUShortPubSubType() { - setName("MapInnerAliasBoundedWStringHelperUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperUShort::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperUShort_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperUShort"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperUShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperUShort_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperUShortPubSubType::~MapInnerAliasBoundedWStringHelperUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -45425,12 +37900,10 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -45445,11 +37918,7 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -45466,11 +37935,7 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -45487,52 +37952,43 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperUShortPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperUShortPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperUShortPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperUShort()); } -void MapInnerAliasBoundedWStringHelperUShortPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperUShortPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -45540,35 +37996,27 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::getKey( const MapInnerAliasBoundedWStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperUShort_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 || MapInnerAliasBoundedWStringHelperUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45581,26 +38029,21 @@ void MapInnerAliasBoundedWStringHelperUShortPubSubType::register_type_object_rep MapInnerAliasBoundedWStringHelperLongPubSubType::MapInnerAliasBoundedWStringHelperLongPubSubType() { - setName("MapInnerAliasBoundedWStringHelperLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperLong"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperLongPubSubType::~MapInnerAliasBoundedWStringHelperLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -45618,12 +38061,10 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -45638,11 +38079,7 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -45659,11 +38096,7 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -45680,52 +38113,43 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperLongPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperLong()); } -void MapInnerAliasBoundedWStringHelperLongPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperLongPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -45733,35 +38157,27 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::getKey( const MapInnerAliasBoundedWStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperLong_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 || MapInnerAliasBoundedWStringHelperLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45774,26 +38190,21 @@ void MapInnerAliasBoundedWStringHelperLongPubSubType::register_type_object_repre MapInnerAliasBoundedWStringHelperULongPubSubType::MapInnerAliasBoundedWStringHelperULongPubSubType() { - setName("MapInnerAliasBoundedWStringHelperULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperULong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperULong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperULong"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperULong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperULong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperULongPubSubType::~MapInnerAliasBoundedWStringHelperULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -45811,12 +38222,10 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -45831,11 +38240,7 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -45852,11 +38257,7 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -45873,52 +38274,43 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperULongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperULongPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperULongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperULong()); } -void MapInnerAliasBoundedWStringHelperULongPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperULongPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -45926,35 +38318,27 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::getKey( const MapInnerAliasBoundedWStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperULong_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 || MapInnerAliasBoundedWStringHelperULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -45967,26 +38351,21 @@ void MapInnerAliasBoundedWStringHelperULongPubSubType::register_type_object_repr MapInnerAliasBoundedWStringHelperLongLongPubSubType::MapInnerAliasBoundedWStringHelperLongLongPubSubType() { - setName("MapInnerAliasBoundedWStringHelperLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperLongLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperLongLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperLongLong"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperLongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperLongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperLongLongPubSubType::~MapInnerAliasBoundedWStringHelperLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -46004,12 +38383,10 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -46024,11 +38401,7 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -46045,11 +38418,7 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -46066,52 +38435,43 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperLongLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperLongLongPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperLongLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperLongLong()); } -void MapInnerAliasBoundedWStringHelperLongLongPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -46119,35 +38479,27 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::getKey( const MapInnerAliasBoundedWStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperLongLong_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 || MapInnerAliasBoundedWStringHelperLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -46160,26 +38512,21 @@ void MapInnerAliasBoundedWStringHelperLongLongPubSubType::register_type_object_r MapInnerAliasBoundedWStringHelperULongLongPubSubType::MapInnerAliasBoundedWStringHelperULongLongPubSubType() { - setName("MapInnerAliasBoundedWStringHelperULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperULongLong::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperULongLong_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperULongLong"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperULongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperULongLong_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperULongLongPubSubType::~MapInnerAliasBoundedWStringHelperULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -46197,12 +38544,10 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -46217,11 +38562,7 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -46238,11 +38579,7 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -46259,52 +38596,43 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperULongLongPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperULongLongPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperULongLongPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperULongLong()); } -void MapInnerAliasBoundedWStringHelperULongLongPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -46312,35 +38640,27 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::getKey( const MapInnerAliasBoundedWStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperULongLong_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 || MapInnerAliasBoundedWStringHelperULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -46353,26 +38673,21 @@ void MapInnerAliasBoundedWStringHelperULongLongPubSubType::register_type_object_ MapInnerAliasBoundedWStringHelperFloatPubSubType::MapInnerAliasBoundedWStringHelperFloatPubSubType() { - setName("MapInnerAliasBoundedWStringHelperFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperFloat::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperFloat_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperFloat"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperFloat_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperFloat_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperFloatPubSubType::~MapInnerAliasBoundedWStringHelperFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -46390,12 +38705,10 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -46410,11 +38723,7 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -46431,11 +38740,7 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -46452,52 +38757,43 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperFloatPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperFloatPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperFloatPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperFloat()); } -void MapInnerAliasBoundedWStringHelperFloatPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperFloatPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -46505,35 +38801,27 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::getKey( const MapInnerAliasBoundedWStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperFloat_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 || MapInnerAliasBoundedWStringHelperFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -46546,26 +38834,21 @@ void MapInnerAliasBoundedWStringHelperFloatPubSubType::register_type_object_repr MapInnerAliasBoundedWStringHelperDoublePubSubType::MapInnerAliasBoundedWStringHelperDoublePubSubType() { - setName("MapInnerAliasBoundedWStringHelperDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperDouble::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperDouble_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperDouble"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperDoublePubSubType::~MapInnerAliasBoundedWStringHelperDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -46583,12 +38866,10 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -46603,32 +38884,185 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } -bool MapInnerAliasBoundedWStringHelperDoublePubSubType::deserialize( +bool MapInnerAliasBoundedWStringHelperDoublePubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapInnerAliasBoundedWStringHelperDoublePubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapInnerAliasBoundedWStringHelperDoublePubSubType::create_data() +{ + return reinterpret_cast(new MapInnerAliasBoundedWStringHelperDouble()); +} + +void MapInnerAliasBoundedWStringHelperDoublePubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapInnerAliasBoundedWStringHelperDouble_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::serialize_key(ser, *p_type); + if (force_md5 || MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapInnerAliasBoundedWStringHelperDoublePubSubType::register_type_object_representation() +{ + register_MapInnerAliasBoundedWStringHelperDouble_type_identifier(type_identifiers_); +} + +MapInnerAliasBoundedWStringHelperLongDoublePubSubType::MapInnerAliasBoundedWStringHelperLongDoublePubSubType() +{ + set_name("MapInnerAliasBoundedWStringHelperLongDouble"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperLongDouble_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperLongDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapInnerAliasBoundedWStringHelperLongDoublePubSubType::~MapInnerAliasBoundedWStringHelperLongDoublePubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::deserialize( SerializedPayload_t* payload, void* data) { try { // Convert DATA to pointer of your type - MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); + MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -46645,245 +39079,43 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperDoublePubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) -{ - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MapInnerAliasBoundedWStringHelperDoublePubSubType::createData() -{ - return reinterpret_cast(new MapInnerAliasBoundedWStringHelperDouble()); -} - -void MapInnerAliasBoundedWStringHelperDoublePubSubType::deleteData( - void* data) -{ - delete(reinterpret_cast(data)); -} - -bool MapInnerAliasBoundedWStringHelperDoublePubSubType::getKey( - const void* const data, - InstanceHandle_t* handle, - bool force_md5) -{ - if (!m_isGetKeyDefined) - { - return false; - } - - const MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), - MapInnerAliasBoundedWStringHelperDouble_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 || MapInnerAliasBoundedWStringHelperDouble_max_key_cdr_typesize > 16) - { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(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; -} - -void MapInnerAliasBoundedWStringHelperDoublePubSubType::register_type_object_representation() -{ - register_MapInnerAliasBoundedWStringHelperDouble_type_identifier(type_identifiers_); -} - -MapInnerAliasBoundedWStringHelperLongDoublePubSubType::MapInnerAliasBoundedWStringHelperLongDoublePubSubType() -{ - setName("MapInnerAliasBoundedWStringHelperLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperLongDouble::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperLongDouble_max_cdr_typesize; -#endif - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperLongDouble_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); -} - -MapInnerAliasBoundedWStringHelperLongDoublePubSubType::~MapInnerAliasBoundedWStringHelperLongDoublePubSubType() -{ - if (m_keyBuffer != nullptr) - { - free(m_keyBuffer); - } -} - -bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else - payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 - return true; -} - -bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, - void* data) { try { - // Convert DATA to pointer of your type - MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { - return false; + return 0; } - - return true; -} - -std::function MapInnerAliasBoundedWStringHelperLongDoublePubSubType::getSerializedSizeProvider( - const void* const data, - DataRepresentationId_t data_representation) -{ - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; } -void* MapInnerAliasBoundedWStringHelperLongDoublePubSubType::createData() +void* MapInnerAliasBoundedWStringHelperLongDoublePubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperLongDouble()); } -void MapInnerAliasBoundedWStringHelperLongDoublePubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -46891,35 +39123,27 @@ bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::getKey( const MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperLongDouble_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 || MapInnerAliasBoundedWStringHelperLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -46932,26 +39156,21 @@ void MapInnerAliasBoundedWStringHelperLongDoublePubSubType::register_type_object MapInnerAliasBoundedWStringHelperBooleanPubSubType::MapInnerAliasBoundedWStringHelperBooleanPubSubType() { - setName("MapInnerAliasBoundedWStringHelperBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperBoolean::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperBoolean_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperBoolean"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperBooleanPubSubType::~MapInnerAliasBoundedWStringHelperBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -46969,12 +39188,10 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -46989,11 +39206,7 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47010,11 +39223,7 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47031,52 +39240,43 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperBooleanPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperBooleanPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperBooleanPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperBoolean()); } -void MapInnerAliasBoundedWStringHelperBooleanPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -47084,35 +39284,27 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::getKey( const MapInnerAliasBoundedWStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperBoolean_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 || MapInnerAliasBoundedWStringHelperBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -47125,26 +39317,21 @@ void MapInnerAliasBoundedWStringHelperBooleanPubSubType::register_type_object_re MapInnerAliasBoundedWStringHelperOctetPubSubType::MapInnerAliasBoundedWStringHelperOctetPubSubType() { - setName("MapInnerAliasBoundedWStringHelperOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperOctet::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperOctet_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperOctet"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperOctetPubSubType::~MapInnerAliasBoundedWStringHelperOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -47162,12 +39349,10 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -47182,11 +39367,7 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47203,11 +39384,7 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47224,52 +39401,43 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperOctetPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperOctetPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperOctetPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperOctet()); } -void MapInnerAliasBoundedWStringHelperOctetPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperOctetPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -47277,35 +39445,27 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::getKey( const MapInnerAliasBoundedWStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperOctet_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 || MapInnerAliasBoundedWStringHelperOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -47318,26 +39478,21 @@ void MapInnerAliasBoundedWStringHelperOctetPubSubType::register_type_object_repr MapInnerAliasBoundedWStringHelperCharPubSubType::MapInnerAliasBoundedWStringHelperCharPubSubType() { - setName("MapInnerAliasBoundedWStringHelperChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperChar::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperChar_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperChar"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperCharPubSubType::~MapInnerAliasBoundedWStringHelperCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -47355,12 +39510,10 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -47375,11 +39528,7 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47396,11 +39545,7 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47417,52 +39562,43 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperCharPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperCharPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperCharPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperChar()); } -void MapInnerAliasBoundedWStringHelperCharPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperCharPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -47470,35 +39606,27 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::getKey( const MapInnerAliasBoundedWStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperChar_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 || MapInnerAliasBoundedWStringHelperChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -47511,26 +39639,21 @@ void MapInnerAliasBoundedWStringHelperCharPubSubType::register_type_object_repre MapInnerAliasBoundedWStringHelperWCharPubSubType::MapInnerAliasBoundedWStringHelperWCharPubSubType() { - setName("MapInnerAliasBoundedWStringHelperWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperWChar::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperWChar_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperWChar"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperWChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperWChar_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperWCharPubSubType::~MapInnerAliasBoundedWStringHelperWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -47548,12 +39671,10 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -47568,11 +39689,7 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47589,11 +39706,7 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47610,52 +39723,43 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperWCharPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperWCharPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperWCharPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperWChar()); } -void MapInnerAliasBoundedWStringHelperWCharPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperWCharPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -47663,35 +39767,27 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::getKey( const MapInnerAliasBoundedWStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperWChar_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 || MapInnerAliasBoundedWStringHelperWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -47704,26 +39800,21 @@ void MapInnerAliasBoundedWStringHelperWCharPubSubType::register_type_object_repr MapInnerAliasBoundedWStringHelperStringPubSubType::MapInnerAliasBoundedWStringHelperStringPubSubType() { - setName("MapInnerAliasBoundedWStringHelperString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperString::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperString_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperString"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperStringPubSubType::~MapInnerAliasBoundedWStringHelperStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -47741,12 +39832,10 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -47761,11 +39850,7 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47782,11 +39867,7 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47803,52 +39884,43 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperStringPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperStringPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperStringPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperString()); } -void MapInnerAliasBoundedWStringHelperStringPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperStringPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -47856,35 +39928,27 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::getKey( const MapInnerAliasBoundedWStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperString_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 || MapInnerAliasBoundedWStringHelperString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -47897,26 +39961,21 @@ void MapInnerAliasBoundedWStringHelperStringPubSubType::register_type_object_rep MapInnerAliasBoundedWStringHelperWStringPubSubType::MapInnerAliasBoundedWStringHelperWStringPubSubType() { - setName("MapInnerAliasBoundedWStringHelperWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperWString::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperWString_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperWString"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperWString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperWString_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperWStringPubSubType::~MapInnerAliasBoundedWStringHelperWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -47934,12 +39993,10 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -47954,11 +40011,7 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -47975,11 +40028,7 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -47996,52 +40045,43 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperWStringPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperWStringPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperWStringPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperWString()); } -void MapInnerAliasBoundedWStringHelperWStringPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperWStringPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -48049,35 +40089,27 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::getKey( const MapInnerAliasBoundedWStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperWString_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 || MapInnerAliasBoundedWStringHelperWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -48090,26 +40122,21 @@ void MapInnerAliasBoundedWStringHelperWStringPubSubType::register_type_object_re MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -48127,12 +40154,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::s data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -48147,11 +40172,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::s } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -48168,11 +40189,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::d eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -48189,52 +40206,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::d return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -48242,35 +40250,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::g const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -48283,26 +40283,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::r MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -48320,12 +40315,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -48340,11 +40333,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -48361,11 +40350,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -48382,52 +40367,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -48435,35 +40411,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -48476,26 +40444,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerEnumHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerEnumHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -48513,12 +40476,10 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -48533,11 +40494,7 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -48554,11 +40511,7 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -48575,52 +40528,43 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerEnumHelper()); } -void MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -48628,35 +40572,27 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerEnumHelper_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 || MapInnerAliasBoundedWStringHelperInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -48669,26 +40605,21 @@ void MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::register_type_o MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerBitMaskHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -48706,12 +40637,10 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -48726,11 +40655,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -48747,11 +40672,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -48768,52 +40689,43 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerBitMaskHelper()); } -void MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -48821,35 +40733,27 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_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 || MapInnerAliasBoundedWStringHelperInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -48862,26 +40766,21 @@ void MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::register_typ MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -48899,12 +40798,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -48919,11 +40816,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -48940,11 +40833,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -48961,52 +40850,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49014,35 +40894,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -49055,26 +40927,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::register_type_ MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -49092,12 +40959,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::serialize data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -49112,11 +40977,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::serialize } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -49133,11 +40994,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::deseriali eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -49154,52 +41011,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::deseriali return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49207,35 +41055,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -49248,26 +41088,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::register_ MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -49285,12 +41120,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::serial data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -49305,11 +41138,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::serial } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -49326,11 +41155,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::deseri eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -49347,52 +41172,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::deseri return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49400,35 +41216,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::getKey const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -49441,26 +41249,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::regist MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerAliasMapHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerAliasMapHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerAliasMapHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -49478,12 +41281,10 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -49498,11 +41299,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -49519,11 +41316,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::deserialize eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -49540,52 +41333,43 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::deserialize return true; } -std::function MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerAliasMapHelper()); } -void MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49593,35 +41377,27 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_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 || MapInnerAliasBoundedWStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -49634,26 +41410,21 @@ void MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::register_ty MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerUnionHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerUnionHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -49671,12 +41442,10 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -49691,11 +41460,7 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -49712,11 +41477,7 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -49733,52 +41494,43 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerUnionHelper()); } -void MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49786,35 +41538,27 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerUnionHelper_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 || MapInnerAliasBoundedWStringHelperInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -49827,26 +41571,21 @@ void MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::register_type_ MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerStructureHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerStructureHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -49864,12 +41603,10 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -49884,11 +41621,7 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -49905,11 +41638,7 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::deserializ eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -49926,52 +41655,43 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::deserializ return true; } -std::function MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerStructureHelper()); } -void MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -49979,35 +41699,27 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerStructureHelper_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 || MapInnerAliasBoundedWStringHelperInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -50020,26 +41732,21 @@ void MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::register_t MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType() { - setName("MapInnerAliasBoundedWStringHelperInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapInnerAliasBoundedWStringHelperInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("MapInnerAliasBoundedWStringHelperInnerBitsetHelper"); + uint32_t type_size = MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::~MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -50057,12 +41764,10 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -50077,11 +41782,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -50098,11 +41799,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -50119,52 +41816,43 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::deserialize( return true; } -std::function MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::createData() +void* MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new MapInnerAliasBoundedWStringHelperInnerBitsetHelper()); } -void MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::deleteData( +void MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::getKey( +bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -50172,35 +41860,27 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::getKey( const MapInnerAliasBoundedWStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapInnerAliasBoundedWStringHelperInnerBitsetHelper_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 || MapInnerAliasBoundedWStringHelperInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -50213,26 +41893,21 @@ void MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::register_type BoundedSmallMapPubSubType::BoundedSmallMapPubSubType() { - setName("BoundedSmallMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedSmallMap::getMaxCdrSerializedSize()); -#else - BoundedSmallMap_max_cdr_typesize; -#endif + set_name("BoundedSmallMap"); + uint32_t type_size = BoundedSmallMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedSmallMap_max_key_cdr_typesize > 16 ? BoundedSmallMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedSmallMap_max_key_cdr_typesize > 16 ? BoundedSmallMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedSmallMapPubSubType::~BoundedSmallMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -50250,12 +41925,10 @@ bool BoundedSmallMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -50270,11 +41943,7 @@ bool BoundedSmallMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -50291,11 +41960,7 @@ bool BoundedSmallMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -50312,52 +41977,43 @@ bool BoundedSmallMapPubSubType::deserialize( return true; } -std::function BoundedSmallMapPubSubType::getSerializedSizeProvider( +uint32_t BoundedSmallMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BoundedSmallMapPubSubType::createData() +void* BoundedSmallMapPubSubType::create_data() { return reinterpret_cast(new BoundedSmallMap()); } -void BoundedSmallMapPubSubType::deleteData( +void BoundedSmallMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedSmallMapPubSubType::getKey( +bool BoundedSmallMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -50365,35 +42021,27 @@ bool BoundedSmallMapPubSubType::getKey( const BoundedSmallMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedSmallMap_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 || BoundedSmallMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -50406,26 +42054,21 @@ void BoundedSmallMapPubSubType::register_type_object_representation() BoundedLargeMapPubSubType::BoundedLargeMapPubSubType() { - setName("BoundedLargeMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedLargeMap::getMaxCdrSerializedSize()); -#else - BoundedLargeMap_max_cdr_typesize; -#endif + set_name("BoundedLargeMap"); + uint32_t type_size = BoundedLargeMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedLargeMap_max_key_cdr_typesize > 16 ? BoundedLargeMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedLargeMap_max_key_cdr_typesize > 16 ? BoundedLargeMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedLargeMapPubSubType::~BoundedLargeMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -50443,12 +42086,10 @@ bool BoundedLargeMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -50463,11 +42104,7 @@ bool BoundedLargeMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -50484,11 +42121,7 @@ bool BoundedLargeMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -50505,52 +42138,43 @@ bool BoundedLargeMapPubSubType::deserialize( return true; } -std::function BoundedLargeMapPubSubType::getSerializedSizeProvider( +uint32_t BoundedLargeMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BoundedLargeMapPubSubType::createData() +void* BoundedLargeMapPubSubType::create_data() { return reinterpret_cast(new BoundedLargeMap()); } -void BoundedLargeMapPubSubType::deleteData( +void BoundedLargeMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedLargeMapPubSubType::getKey( +bool BoundedLargeMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -50558,35 +42182,27 @@ bool BoundedLargeMapPubSubType::getKey( const BoundedLargeMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedLargeMap_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 || BoundedLargeMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index 6d58575762a..bd207b35649 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -62,18 +62,18 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2134,18 +2134,18 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2180,8 +2180,8 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2208,18 +2208,18 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2254,8 +2254,8 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2282,18 +2282,18 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2328,8 +2328,8 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2356,18 +2356,18 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2402,8 +2402,8 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2430,18 +2430,18 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2476,8 +2476,8 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2504,18 +2504,18 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2550,8 +2550,8 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2578,18 +2578,18 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2624,8 +2624,8 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2652,18 +2652,18 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2698,8 +2698,8 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2726,18 +2726,18 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2772,8 +2772,8 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2800,18 +2800,18 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2846,8 +2846,8 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2874,18 +2874,18 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2920,8 +2920,8 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2948,18 +2948,18 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2994,8 +2994,8 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3022,18 +3022,18 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3068,8 +3068,8 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3096,18 +3096,18 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3142,8 +3142,8 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3170,18 +3170,18 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3216,8 +3216,8 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3244,18 +3244,18 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3290,8 +3290,8 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3318,18 +3318,18 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3364,8 +3364,8 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3392,18 +3392,18 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3438,8 +3438,8 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3466,18 +3466,18 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3512,8 +3512,8 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3540,18 +3540,18 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3586,8 +3586,8 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3614,18 +3614,18 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3660,8 +3660,8 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3688,18 +3688,18 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3734,8 +3734,8 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3762,18 +3762,18 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3808,8 +3808,8 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3836,18 +3836,18 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3882,8 +3882,8 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3910,18 +3910,18 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3956,8 +3956,8 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3984,18 +3984,18 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4030,8 +4030,8 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4058,18 +4058,18 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4104,8 +4104,8 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4132,18 +4132,18 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4178,8 +4178,8 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4206,18 +4206,18 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4252,8 +4252,8 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4280,18 +4280,18 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4326,8 +4326,8 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4354,18 +4354,18 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4400,8 +4400,8 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4428,18 +4428,18 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4474,8 +4474,8 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4502,18 +4502,18 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4548,8 +4548,8 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4576,18 +4576,18 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4622,8 +4622,8 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4650,18 +4650,18 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4696,8 +4696,8 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4724,18 +4724,18 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4770,8 +4770,8 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4798,18 +4798,18 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4844,8 +4844,8 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4872,18 +4872,18 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4918,8 +4918,8 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4946,18 +4946,18 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4992,8 +4992,8 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5020,18 +5020,18 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5066,8 +5066,8 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5094,18 +5094,18 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5140,8 +5140,8 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5168,18 +5168,18 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5214,8 +5214,8 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5242,18 +5242,18 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5288,8 +5288,8 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5316,18 +5316,18 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5362,8 +5362,8 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5390,18 +5390,18 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5436,8 +5436,8 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5464,18 +5464,18 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5510,8 +5510,8 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5538,18 +5538,18 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5584,8 +5584,8 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5612,18 +5612,18 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5658,8 +5658,8 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5686,18 +5686,18 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5732,8 +5732,8 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5760,18 +5760,18 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5806,8 +5806,8 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5834,18 +5834,18 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5880,8 +5880,8 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5908,18 +5908,18 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5954,8 +5954,8 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5982,18 +5982,18 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6028,8 +6028,8 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6056,18 +6056,18 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6102,8 +6102,8 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6130,18 +6130,18 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6176,8 +6176,8 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6204,18 +6204,18 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6250,8 +6250,8 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6278,18 +6278,18 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6324,8 +6324,8 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6352,18 +6352,18 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6398,8 +6398,8 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6426,18 +6426,18 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6472,8 +6472,8 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6500,18 +6500,18 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6546,8 +6546,8 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6574,18 +6574,18 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6620,8 +6620,8 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6648,18 +6648,18 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6694,8 +6694,8 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6722,18 +6722,18 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6768,8 +6768,8 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6796,18 +6796,18 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6842,8 +6842,8 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6870,18 +6870,18 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6916,8 +6916,8 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -6944,18 +6944,18 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6990,8 +6990,8 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7018,18 +7018,18 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7064,8 +7064,8 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7092,18 +7092,18 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7138,8 +7138,8 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7166,18 +7166,18 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7212,8 +7212,8 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7240,18 +7240,18 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7286,8 +7286,8 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7314,18 +7314,18 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7360,8 +7360,8 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7388,18 +7388,18 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7434,8 +7434,8 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7462,18 +7462,18 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7508,8 +7508,8 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7536,18 +7536,18 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7582,8 +7582,8 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7610,18 +7610,18 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7656,8 +7656,8 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7684,18 +7684,18 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7730,8 +7730,8 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7758,18 +7758,18 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7804,8 +7804,8 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7832,18 +7832,18 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7878,8 +7878,8 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7906,18 +7906,18 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -7952,8 +7952,8 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -7980,18 +7980,18 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8026,8 +8026,8 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8054,18 +8054,18 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8100,8 +8100,8 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8128,18 +8128,18 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8174,8 +8174,8 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8202,18 +8202,18 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8248,8 +8248,8 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8276,18 +8276,18 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8322,8 +8322,8 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8350,18 +8350,18 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8396,8 +8396,8 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8424,18 +8424,18 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8470,8 +8470,8 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8498,18 +8498,18 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8544,8 +8544,8 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8572,18 +8572,18 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8618,8 +8618,8 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8646,18 +8646,18 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8692,8 +8692,8 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8720,18 +8720,18 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8766,8 +8766,8 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8794,18 +8794,18 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8840,8 +8840,8 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8868,18 +8868,18 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8914,8 +8914,8 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -8942,18 +8942,18 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -8988,8 +8988,8 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9016,18 +9016,18 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9062,8 +9062,8 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9090,18 +9090,18 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9136,8 +9136,8 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9164,18 +9164,18 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9210,8 +9210,8 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9238,18 +9238,18 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9284,8 +9284,8 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9312,18 +9312,18 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9358,8 +9358,8 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9386,18 +9386,18 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9432,8 +9432,8 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9460,18 +9460,18 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9506,8 +9506,8 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9534,18 +9534,18 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9580,8 +9580,8 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9608,18 +9608,18 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9654,8 +9654,8 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9682,18 +9682,18 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9728,8 +9728,8 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9756,18 +9756,18 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9802,8 +9802,8 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9830,18 +9830,18 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9876,8 +9876,8 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9904,18 +9904,18 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -9950,8 +9950,8 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -9978,18 +9978,18 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10024,8 +10024,8 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10052,18 +10052,18 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10098,8 +10098,8 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10126,18 +10126,18 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10172,8 +10172,8 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10200,18 +10200,18 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10246,8 +10246,8 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10274,18 +10274,18 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10320,8 +10320,8 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10348,18 +10348,18 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10394,8 +10394,8 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10422,18 +10422,18 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10468,8 +10468,8 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10496,18 +10496,18 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10542,8 +10542,8 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10570,18 +10570,18 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10616,8 +10616,8 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10644,18 +10644,18 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10690,8 +10690,8 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10718,18 +10718,18 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10764,8 +10764,8 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10792,18 +10792,18 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10838,8 +10838,8 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10866,18 +10866,18 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10912,8 +10912,8 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -10940,18 +10940,18 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -10986,8 +10986,8 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11014,18 +11014,18 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11060,8 +11060,8 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11088,18 +11088,18 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11134,8 +11134,8 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11162,18 +11162,18 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11208,8 +11208,8 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11236,18 +11236,18 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11282,8 +11282,8 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11310,18 +11310,18 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11356,8 +11356,8 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11384,18 +11384,18 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11430,8 +11430,8 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11458,18 +11458,18 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11504,8 +11504,8 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11532,18 +11532,18 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11578,8 +11578,8 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11606,18 +11606,18 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11652,8 +11652,8 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11680,18 +11680,18 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11726,8 +11726,8 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11754,18 +11754,18 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11800,8 +11800,8 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11828,18 +11828,18 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11874,8 +11874,8 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11902,18 +11902,18 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -11948,8 +11948,8 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -11976,18 +11976,18 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12022,8 +12022,8 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12050,18 +12050,18 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12096,8 +12096,8 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12124,18 +12124,18 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12170,8 +12170,8 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12198,18 +12198,18 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12244,8 +12244,8 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12272,18 +12272,18 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12318,8 +12318,8 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12346,18 +12346,18 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12392,8 +12392,8 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12420,18 +12420,18 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12466,8 +12466,8 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12494,18 +12494,18 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12540,8 +12540,8 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12568,18 +12568,18 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12614,8 +12614,8 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12642,18 +12642,18 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12688,8 +12688,8 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12716,18 +12716,18 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12762,8 +12762,8 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12790,18 +12790,18 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12836,8 +12836,8 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12864,18 +12864,18 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12910,8 +12910,8 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -12938,18 +12938,18 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -12984,8 +12984,8 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13012,18 +13012,18 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13058,8 +13058,8 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13086,18 +13086,18 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13132,8 +13132,8 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13160,18 +13160,18 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13206,8 +13206,8 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13234,18 +13234,18 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13280,8 +13280,8 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13308,18 +13308,18 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13354,8 +13354,8 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13382,18 +13382,18 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13428,8 +13428,8 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13456,18 +13456,18 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13502,8 +13502,8 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13530,18 +13530,18 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13576,8 +13576,8 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13604,18 +13604,18 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13650,8 +13650,8 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13678,18 +13678,18 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13724,8 +13724,8 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13752,18 +13752,18 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13798,8 +13798,8 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13826,18 +13826,18 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13872,8 +13872,8 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13900,18 +13900,18 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -13946,8 +13946,8 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -13974,18 +13974,18 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14020,8 +14020,8 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14048,18 +14048,18 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14094,8 +14094,8 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14122,18 +14122,18 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14168,8 +14168,8 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14196,18 +14196,18 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14242,8 +14242,8 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14270,18 +14270,18 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14316,8 +14316,8 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14344,18 +14344,18 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14390,8 +14390,8 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14418,18 +14418,18 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14464,8 +14464,8 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14492,18 +14492,18 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14538,8 +14538,8 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14566,18 +14566,18 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14612,8 +14612,8 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14640,18 +14640,18 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14686,8 +14686,8 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14714,18 +14714,18 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14760,8 +14760,8 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14788,18 +14788,18 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14834,8 +14834,8 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14862,18 +14862,18 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14908,8 +14908,8 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -14936,18 +14936,18 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -14982,8 +14982,8 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15010,18 +15010,18 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15056,8 +15056,8 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15084,18 +15084,18 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15130,8 +15130,8 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15158,18 +15158,18 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15204,8 +15204,8 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15232,18 +15232,18 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15278,8 +15278,8 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15306,18 +15306,18 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15352,8 +15352,8 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15380,18 +15380,18 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15426,8 +15426,8 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15454,18 +15454,18 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15500,8 +15500,8 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15528,18 +15528,18 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15574,8 +15574,8 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15602,18 +15602,18 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15648,8 +15648,8 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15676,18 +15676,18 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15722,8 +15722,8 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15750,18 +15750,18 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15796,8 +15796,8 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15824,18 +15824,18 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15870,8 +15870,8 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15898,18 +15898,18 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -15944,8 +15944,8 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -15972,18 +15972,18 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16018,8 +16018,8 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16046,18 +16046,18 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16092,8 +16092,8 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16120,18 +16120,18 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16166,8 +16166,8 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16194,18 +16194,18 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16240,8 +16240,8 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16268,18 +16268,18 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16314,8 +16314,8 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16342,18 +16342,18 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16388,8 +16388,8 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16416,18 +16416,18 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16462,8 +16462,8 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16490,18 +16490,18 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16536,8 +16536,8 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16564,18 +16564,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16610,8 +16610,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16638,18 +16638,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16684,8 +16684,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16712,18 +16712,18 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16758,8 +16758,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16786,18 +16786,18 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16832,8 +16832,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16860,18 +16860,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16906,8 +16906,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -16934,18 +16934,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -16980,8 +16980,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17008,18 +17008,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17054,8 +17054,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17082,18 +17082,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17128,8 +17128,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17156,18 +17156,18 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17202,8 +17202,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17230,18 +17230,18 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17276,8 +17276,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17304,18 +17304,18 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17350,8 +17350,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17378,18 +17378,18 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17424,8 +17424,8 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17452,18 +17452,18 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17498,8 +17498,8 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17526,18 +17526,18 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17572,8 +17572,8 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17600,18 +17600,18 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17646,8 +17646,8 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17674,18 +17674,18 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17720,8 +17720,8 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17748,18 +17748,18 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17794,8 +17794,8 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17822,18 +17822,18 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17868,8 +17868,8 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17896,18 +17896,18 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -17942,8 +17942,8 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -17970,18 +17970,18 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18016,8 +18016,8 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18044,18 +18044,18 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18090,8 +18090,8 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18118,18 +18118,18 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18164,8 +18164,8 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18192,18 +18192,18 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18238,8 +18238,8 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18266,18 +18266,18 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18312,8 +18312,8 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18340,18 +18340,18 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18386,8 +18386,8 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18414,18 +18414,18 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18460,8 +18460,8 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18488,18 +18488,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18534,8 +18534,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18562,18 +18562,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18608,8 +18608,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18636,18 +18636,18 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18682,8 +18682,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18710,18 +18710,18 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18756,8 +18756,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18784,18 +18784,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18830,8 +18830,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18858,18 +18858,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18904,8 +18904,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -18932,18 +18932,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -18978,8 +18978,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19006,18 +19006,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19052,8 +19052,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19080,18 +19080,18 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19126,8 +19126,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19154,18 +19154,18 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19200,8 +19200,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19228,18 +19228,18 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19274,8 +19274,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19302,18 +19302,18 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19348,8 +19348,8 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -19376,18 +19376,18 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -19422,8 +19422,8 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/member_idPubSubTypes.cxx b/test/dds-types-test/member_idPubSubTypes.cxx index 043b5dd6cc1..0aaa011e558 100644 --- a/test/dds-types-test/member_idPubSubTypes.cxx +++ b/test/dds-types-test/member_idPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FixIdPubSubType::FixIdPubSubType() { - setName("FixId"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixId::getMaxCdrSerializedSize()); -#else - FixId_max_cdr_typesize; -#endif + set_name("FixId"); + uint32_t type_size = FixId_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixId_max_key_cdr_typesize > 16 ? FixId_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixId_max_key_cdr_typesize > 16 ? FixId_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixIdPubSubType::~FixIdPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool FixIdPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool FixIdPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool FixIdPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool FixIdPubSubType::deserialize( return true; } -std::function FixIdPubSubType::getSerializedSizeProvider( +uint32_t FixIdPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FixIdPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FixIdPubSubType::create_data() { return reinterpret_cast(new FixId()); } -void FixIdPubSubType::deleteData( +void FixIdPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixIdPubSubType::getKey( +bool FixIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool FixIdPubSubType::getKey( const FixId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixId_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 || FixId_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void FixIdPubSubType::register_type_object_representation() FixHexIdPubSubType::FixHexIdPubSubType() { - setName("FixHexId"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixHexId::getMaxCdrSerializedSize()); -#else - FixHexId_max_cdr_typesize; -#endif + set_name("FixHexId"); + uint32_t type_size = FixHexId_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixHexId_max_key_cdr_typesize > 16 ? FixHexId_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixHexId_max_key_cdr_typesize > 16 ? FixHexId_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixHexIdPubSubType::~FixHexIdPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool FixHexIdPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool FixHexIdPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool FixHexIdPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool FixHexIdPubSubType::deserialize( return true; } -std::function FixHexIdPubSubType::getSerializedSizeProvider( +uint32_t FixHexIdPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FixHexIdPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FixHexIdPubSubType::create_data() { return reinterpret_cast(new FixHexId()); } -void FixHexIdPubSubType::deleteData( +void FixHexIdPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixHexIdPubSubType::getKey( +bool FixHexIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool FixHexIdPubSubType::getKey( const FixHexId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixHexId_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 || FixHexId_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void FixHexIdPubSubType::register_type_object_representation() FixHashidDefaultPubSubType::FixHashidDefaultPubSubType() { - setName("FixHashidDefault"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixHashidDefault::getMaxCdrSerializedSize()); -#else - FixHashidDefault_max_cdr_typesize; -#endif + set_name("FixHashidDefault"); + uint32_t type_size = FixHashidDefault_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixHashidDefault_max_key_cdr_typesize > 16 ? FixHashidDefault_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixHashidDefault_max_key_cdr_typesize > 16 ? FixHashidDefault_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixHashidDefaultPubSubType::~FixHashidDefaultPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool FixHashidDefaultPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool FixHashidDefaultPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool FixHashidDefaultPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool FixHashidDefaultPubSubType::deserialize( return true; } -std::function FixHashidDefaultPubSubType::getSerializedSizeProvider( +uint32_t FixHashidDefaultPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FixHashidDefaultPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FixHashidDefaultPubSubType::create_data() { return reinterpret_cast(new FixHashidDefault()); } -void FixHashidDefaultPubSubType::deleteData( +void FixHashidDefaultPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixHashidDefaultPubSubType::getKey( +bool FixHashidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool FixHashidDefaultPubSubType::getKey( const FixHashidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixHashidDefault_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 || FixHashidDefault_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void FixHashidDefaultPubSubType::register_type_object_representation() FixHashidPubSubType::FixHashidPubSubType() { - setName("FixHashid"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixHashid::getMaxCdrSerializedSize()); -#else - FixHashid_max_cdr_typesize; -#endif + set_name("FixHashid"); + uint32_t type_size = FixHashid_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixHashid_max_key_cdr_typesize > 16 ? FixHashid_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixHashid_max_key_cdr_typesize > 16 ? FixHashid_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixHashidPubSubType::~FixHashidPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool FixHashidPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool FixHashidPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool FixHashidPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool FixHashidPubSubType::deserialize( return true; } -std::function FixHashidPubSubType::getSerializedSizeProvider( +uint32_t FixHashidPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FixHashidPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FixHashidPubSubType::create_data() { return reinterpret_cast(new FixHashid()); } -void FixHashidPubSubType::deleteData( +void FixHashidPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixHashidPubSubType::getKey( +bool FixHashidPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool FixHashidPubSubType::getKey( const FixHashid* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixHashid_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 || FixHashid_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void FixHashidPubSubType::register_type_object_representation() FixMixPubSubType::FixMixPubSubType() { - setName("FixMix"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FixMix::getMaxCdrSerializedSize()); -#else - FixMix_max_cdr_typesize; -#endif + set_name("FixMix"); + uint32_t type_size = FixMix_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FixMix_max_key_cdr_typesize > 16 ? FixMix_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FixMix_max_key_cdr_typesize > 16 ? FixMix_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FixMixPubSubType::~FixMixPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool FixMixPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool FixMixPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool FixMixPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool FixMixPubSubType::deserialize( return true; } -std::function FixMixPubSubType::getSerializedSizeProvider( +uint32_t FixMixPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FixMixPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FixMixPubSubType::create_data() { return reinterpret_cast(new FixMix()); } -void FixMixPubSubType::deleteData( +void FixMixPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FixMixPubSubType::getKey( +bool FixMixPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool FixMixPubSubType::getKey( const FixMix* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FixMix_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 || FixMix_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void FixMixPubSubType::register_type_object_representation() AutoidDefaultPubSubType::AutoidDefaultPubSubType() { - setName("AutoidDefault"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AutoidDefault::getMaxCdrSerializedSize()); -#else - AutoidDefault_max_cdr_typesize; -#endif + set_name("AutoidDefault"); + uint32_t type_size = AutoidDefault_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AutoidDefault_max_key_cdr_typesize > 16 ? AutoidDefault_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AutoidDefault_max_key_cdr_typesize > 16 ? AutoidDefault_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AutoidDefaultPubSubType::~AutoidDefaultPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool AutoidDefaultPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool AutoidDefaultPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool AutoidDefaultPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool AutoidDefaultPubSubType::deserialize( return true; } -std::function AutoidDefaultPubSubType::getSerializedSizeProvider( +uint32_t AutoidDefaultPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AutoidDefaultPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AutoidDefaultPubSubType::create_data() { return reinterpret_cast(new AutoidDefault()); } -void AutoidDefaultPubSubType::deleteData( +void AutoidDefaultPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AutoidDefaultPubSubType::getKey( +bool AutoidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool AutoidDefaultPubSubType::getKey( const AutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AutoidDefault_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 || AutoidDefault_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void AutoidDefaultPubSubType::register_type_object_representation() AutoidSequentialPubSubType::AutoidSequentialPubSubType() { - setName("AutoidSequential"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AutoidSequential::getMaxCdrSerializedSize()); -#else - AutoidSequential_max_cdr_typesize; -#endif + set_name("AutoidSequential"); + uint32_t type_size = AutoidSequential_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AutoidSequential_max_key_cdr_typesize > 16 ? AutoidSequential_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AutoidSequential_max_key_cdr_typesize > 16 ? AutoidSequential_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AutoidSequentialPubSubType::~AutoidSequentialPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool AutoidSequentialPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool AutoidSequentialPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool AutoidSequentialPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool AutoidSequentialPubSubType::deserialize( return true; } -std::function AutoidSequentialPubSubType::getSerializedSizeProvider( +uint32_t AutoidSequentialPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AutoidSequentialPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AutoidSequentialPubSubType::create_data() { return reinterpret_cast(new AutoidSequential()); } -void AutoidSequentialPubSubType::deleteData( +void AutoidSequentialPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AutoidSequentialPubSubType::getKey( +bool AutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool AutoidSequentialPubSubType::getKey( const AutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AutoidSequential_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 || AutoidSequential_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void AutoidSequentialPubSubType::register_type_object_representation() AutoidHashPubSubType::AutoidHashPubSubType() { - setName("AutoidHash"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AutoidHash::getMaxCdrSerializedSize()); -#else - AutoidHash_max_cdr_typesize; -#endif + set_name("AutoidHash"); + uint32_t type_size = AutoidHash_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AutoidHash_max_key_cdr_typesize > 16 ? AutoidHash_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AutoidHash_max_key_cdr_typesize > 16 ? AutoidHash_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AutoidHashPubSubType::~AutoidHashPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool AutoidHashPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool AutoidHashPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool AutoidHashPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool AutoidHashPubSubType::deserialize( return true; } -std::function AutoidHashPubSubType::getSerializedSizeProvider( +uint32_t AutoidHashPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AutoidHashPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AutoidHashPubSubType::create_data() { return reinterpret_cast(new AutoidHash()); } -void AutoidHashPubSubType::deleteData( +void AutoidHashPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AutoidHashPubSubType::getKey( +bool AutoidHashPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool AutoidHashPubSubType::getKey( const AutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AutoidHash_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 || AutoidHash_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void AutoidHashPubSubType::register_type_object_representation() DerivedAutoidDefaultPubSubType::DerivedAutoidDefaultPubSubType() { - setName("DerivedAutoidDefault"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DerivedAutoidDefault::getMaxCdrSerializedSize()); -#else - DerivedAutoidDefault_max_cdr_typesize; -#endif + set_name("DerivedAutoidDefault"); + uint32_t type_size = DerivedAutoidDefault_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DerivedAutoidDefault_max_key_cdr_typesize > 16 ? DerivedAutoidDefault_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DerivedAutoidDefault_max_key_cdr_typesize > 16 ? DerivedAutoidDefault_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DerivedAutoidDefaultPubSubType::~DerivedAutoidDefaultPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool DerivedAutoidDefaultPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool DerivedAutoidDefaultPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool DerivedAutoidDefaultPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool DerivedAutoidDefaultPubSubType::deserialize( return true; } -std::function DerivedAutoidDefaultPubSubType::getSerializedSizeProvider( +uint32_t DerivedAutoidDefaultPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DerivedAutoidDefaultPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DerivedAutoidDefaultPubSubType::create_data() { return reinterpret_cast(new DerivedAutoidDefault()); } -void DerivedAutoidDefaultPubSubType::deleteData( +void DerivedAutoidDefaultPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DerivedAutoidDefaultPubSubType::getKey( +bool DerivedAutoidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool DerivedAutoidDefaultPubSubType::getKey( const DerivedAutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DerivedAutoidDefault_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 || DerivedAutoidDefault_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void DerivedAutoidDefaultPubSubType::register_type_object_representation() DerivedEmptyAutoidSequentialPubSubType::DerivedEmptyAutoidSequentialPubSubType() { - setName("DerivedEmptyAutoidSequential"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DerivedEmptyAutoidSequential::getMaxCdrSerializedSize()); -#else - DerivedEmptyAutoidSequential_max_cdr_typesize; -#endif + set_name("DerivedEmptyAutoidSequential"); + uint32_t type_size = DerivedEmptyAutoidSequential_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DerivedEmptyAutoidSequential_max_key_cdr_typesize > 16 ? DerivedEmptyAutoidSequential_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DerivedEmptyAutoidSequential_max_key_cdr_typesize > 16 ? DerivedEmptyAutoidSequential_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DerivedEmptyAutoidSequentialPubSubType::~DerivedEmptyAutoidSequentialPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool DerivedEmptyAutoidSequentialPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool DerivedEmptyAutoidSequentialPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool DerivedEmptyAutoidSequentialPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool DerivedEmptyAutoidSequentialPubSubType::deserialize( return true; } -std::function DerivedEmptyAutoidSequentialPubSubType::getSerializedSizeProvider( +uint32_t DerivedEmptyAutoidSequentialPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DerivedEmptyAutoidSequentialPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DerivedEmptyAutoidSequentialPubSubType::create_data() { return reinterpret_cast(new DerivedEmptyAutoidSequential()); } -void DerivedEmptyAutoidSequentialPubSubType::deleteData( +void DerivedEmptyAutoidSequentialPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DerivedEmptyAutoidSequentialPubSubType::getKey( +bool DerivedEmptyAutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool DerivedEmptyAutoidSequentialPubSubType::getKey( const DerivedEmptyAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DerivedEmptyAutoidSequential_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 || DerivedEmptyAutoidSequential_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void DerivedEmptyAutoidSequentialPubSubType::register_type_object_representation DerivedAutoidSequentialPubSubType::DerivedAutoidSequentialPubSubType() { - setName("DerivedAutoidSequential"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DerivedAutoidSequential::getMaxCdrSerializedSize()); -#else - DerivedAutoidSequential_max_cdr_typesize; -#endif + set_name("DerivedAutoidSequential"); + uint32_t type_size = DerivedAutoidSequential_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DerivedAutoidSequential_max_key_cdr_typesize > 16 ? DerivedAutoidSequential_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DerivedAutoidSequential_max_key_cdr_typesize > 16 ? DerivedAutoidSequential_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DerivedAutoidSequentialPubSubType::~DerivedAutoidSequentialPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool DerivedAutoidSequentialPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool DerivedAutoidSequentialPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool DerivedAutoidSequentialPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool DerivedAutoidSequentialPubSubType::deserialize( return true; } -std::function DerivedAutoidSequentialPubSubType::getSerializedSizeProvider( +uint32_t DerivedAutoidSequentialPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DerivedAutoidSequentialPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DerivedAutoidSequentialPubSubType::create_data() { return reinterpret_cast(new DerivedAutoidSequential()); } -void DerivedAutoidSequentialPubSubType::deleteData( +void DerivedAutoidSequentialPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DerivedAutoidSequentialPubSubType::getKey( +bool DerivedAutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool DerivedAutoidSequentialPubSubType::getKey( const DerivedAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DerivedAutoidSequential_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 || DerivedAutoidSequential_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void DerivedAutoidSequentialPubSubType::register_type_object_representation() DerivedAutoidHashPubSubType::DerivedAutoidHashPubSubType() { - setName("DerivedAutoidHash"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DerivedAutoidHash::getMaxCdrSerializedSize()); -#else - DerivedAutoidHash_max_cdr_typesize; -#endif + set_name("DerivedAutoidHash"); + uint32_t type_size = DerivedAutoidHash_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DerivedAutoidHash_max_key_cdr_typesize > 16 ? DerivedAutoidHash_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DerivedAutoidHash_max_key_cdr_typesize > 16 ? DerivedAutoidHash_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DerivedAutoidHashPubSubType::~DerivedAutoidHashPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool DerivedAutoidHashPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool DerivedAutoidHashPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool DerivedAutoidHashPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool DerivedAutoidHashPubSubType::deserialize( return true; } -std::function DerivedAutoidHashPubSubType::getSerializedSizeProvider( +uint32_t DerivedAutoidHashPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DerivedAutoidHashPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DerivedAutoidHashPubSubType::create_data() { return reinterpret_cast(new DerivedAutoidHash()); } -void DerivedAutoidHashPubSubType::deleteData( +void DerivedAutoidHashPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DerivedAutoidHashPubSubType::getKey( +bool DerivedAutoidHashPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool DerivedAutoidHashPubSubType::getKey( const DerivedAutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DerivedAutoidHash_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 || DerivedAutoidHash_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index 6dc1da78bb2..e06ad86e246 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -61,18 +61,18 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -135,18 +135,18 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -181,8 +181,8 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -209,18 +209,18 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -255,8 +255,8 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -283,18 +283,18 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -329,8 +329,8 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -357,18 +357,18 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -403,8 +403,8 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -431,18 +431,18 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -477,8 +477,8 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -505,18 +505,18 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -551,8 +551,8 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -579,18 +579,18 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -625,8 +625,8 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -653,18 +653,18 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -699,8 +699,8 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -727,18 +727,18 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -773,8 +773,8 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -801,18 +801,18 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -847,8 +847,8 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -875,18 +875,18 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -921,8 +921,8 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/mutablePubSubTypes.cxx b/test/dds-types-test/mutablePubSubTypes.cxx index 2b9db087693..33fe7ef8382 100644 --- a/test/dds-types-test/mutablePubSubTypes.cxx +++ b/test/dds-types-test/mutablePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; MutableShortStructPubSubType::MutableShortStructPubSubType() { - setName("MutableShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableShortStruct::getMaxCdrSerializedSize()); -#else - MutableShortStruct_max_cdr_typesize; -#endif + set_name("MutableShortStruct"); + uint32_t type_size = MutableShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableShortStruct_max_key_cdr_typesize > 16 ? MutableShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableShortStruct_max_key_cdr_typesize > 16 ? MutableShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableShortStructPubSubType::~MutableShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool MutableShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool MutableShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool MutableShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool MutableShortStructPubSubType::deserialize( return true; } -std::function MutableShortStructPubSubType::getSerializedSizeProvider( +uint32_t MutableShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableShortStructPubSubType::create_data() { return reinterpret_cast(new MutableShortStruct()); } -void MutableShortStructPubSubType::deleteData( +void MutableShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableShortStructPubSubType::getKey( +bool MutableShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool MutableShortStructPubSubType::getKey( const MutableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableShortStruct_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 || MutableShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void MutableShortStructPubSubType::register_type_object_representation() MutableUShortStructPubSubType::MutableUShortStructPubSubType() { - setName("MutableUShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableUShortStruct::getMaxCdrSerializedSize()); -#else - MutableUShortStruct_max_cdr_typesize; -#endif + set_name("MutableUShortStruct"); + uint32_t type_size = MutableUShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableUShortStruct_max_key_cdr_typesize > 16 ? MutableUShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableUShortStruct_max_key_cdr_typesize > 16 ? MutableUShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableUShortStructPubSubType::~MutableUShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool MutableUShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool MutableUShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool MutableUShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool MutableUShortStructPubSubType::deserialize( return true; } -std::function MutableUShortStructPubSubType::getSerializedSizeProvider( +uint32_t MutableUShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableUShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableUShortStructPubSubType::create_data() { return reinterpret_cast(new MutableUShortStruct()); } -void MutableUShortStructPubSubType::deleteData( +void MutableUShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableUShortStructPubSubType::getKey( +bool MutableUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool MutableUShortStructPubSubType::getKey( const MutableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableUShortStruct_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 || MutableUShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void MutableUShortStructPubSubType::register_type_object_representation() MutableLongStructPubSubType::MutableLongStructPubSubType() { - setName("MutableLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableLongStruct::getMaxCdrSerializedSize()); -#else - MutableLongStruct_max_cdr_typesize; -#endif + set_name("MutableLongStruct"); + uint32_t type_size = MutableLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableLongStruct_max_key_cdr_typesize > 16 ? MutableLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableLongStruct_max_key_cdr_typesize > 16 ? MutableLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableLongStructPubSubType::~MutableLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool MutableLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool MutableLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool MutableLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool MutableLongStructPubSubType::deserialize( return true; } -std::function MutableLongStructPubSubType::getSerializedSizeProvider( +uint32_t MutableLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableLongStructPubSubType::create_data() { return reinterpret_cast(new MutableLongStruct()); } -void MutableLongStructPubSubType::deleteData( +void MutableLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableLongStructPubSubType::getKey( +bool MutableLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool MutableLongStructPubSubType::getKey( const MutableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableLongStruct_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 || MutableLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void MutableLongStructPubSubType::register_type_object_representation() MutableULongStructPubSubType::MutableULongStructPubSubType() { - setName("MutableULongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableULongStruct::getMaxCdrSerializedSize()); -#else - MutableULongStruct_max_cdr_typesize; -#endif + set_name("MutableULongStruct"); + uint32_t type_size = MutableULongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableULongStruct_max_key_cdr_typesize > 16 ? MutableULongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableULongStruct_max_key_cdr_typesize > 16 ? MutableULongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableULongStructPubSubType::~MutableULongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool MutableULongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool MutableULongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool MutableULongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool MutableULongStructPubSubType::deserialize( return true; } -std::function MutableULongStructPubSubType::getSerializedSizeProvider( +uint32_t MutableULongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableULongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableULongStructPubSubType::create_data() { return reinterpret_cast(new MutableULongStruct()); } -void MutableULongStructPubSubType::deleteData( +void MutableULongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableULongStructPubSubType::getKey( +bool MutableULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool MutableULongStructPubSubType::getKey( const MutableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableULongStruct_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 || MutableULongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void MutableULongStructPubSubType::register_type_object_representation() MutableLongLongStructPubSubType::MutableLongLongStructPubSubType() { - setName("MutableLongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableLongLongStruct::getMaxCdrSerializedSize()); -#else - MutableLongLongStruct_max_cdr_typesize; -#endif + set_name("MutableLongLongStruct"); + uint32_t type_size = MutableLongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableLongLongStruct_max_key_cdr_typesize > 16 ? MutableLongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableLongLongStruct_max_key_cdr_typesize > 16 ? MutableLongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableLongLongStructPubSubType::~MutableLongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool MutableLongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool MutableLongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool MutableLongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool MutableLongLongStructPubSubType::deserialize( return true; } -std::function MutableLongLongStructPubSubType::getSerializedSizeProvider( +uint32_t MutableLongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableLongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableLongLongStructPubSubType::create_data() { return reinterpret_cast(new MutableLongLongStruct()); } -void MutableLongLongStructPubSubType::deleteData( +void MutableLongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableLongLongStructPubSubType::getKey( +bool MutableLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool MutableLongLongStructPubSubType::getKey( const MutableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableLongLongStruct_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 || MutableLongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void MutableLongLongStructPubSubType::register_type_object_representation() MutableULongLongStructPubSubType::MutableULongLongStructPubSubType() { - setName("MutableULongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableULongLongStruct::getMaxCdrSerializedSize()); -#else - MutableULongLongStruct_max_cdr_typesize; -#endif + set_name("MutableULongLongStruct"); + uint32_t type_size = MutableULongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableULongLongStruct_max_key_cdr_typesize > 16 ? MutableULongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableULongLongStruct_max_key_cdr_typesize > 16 ? MutableULongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableULongLongStructPubSubType::~MutableULongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool MutableULongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool MutableULongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool MutableULongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool MutableULongLongStructPubSubType::deserialize( return true; } -std::function MutableULongLongStructPubSubType::getSerializedSizeProvider( +uint32_t MutableULongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableULongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableULongLongStructPubSubType::create_data() { return reinterpret_cast(new MutableULongLongStruct()); } -void MutableULongLongStructPubSubType::deleteData( +void MutableULongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableULongLongStructPubSubType::getKey( +bool MutableULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool MutableULongLongStructPubSubType::getKey( const MutableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableULongLongStruct_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 || MutableULongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void MutableULongLongStructPubSubType::register_type_object_representation() MutableFloatStructPubSubType::MutableFloatStructPubSubType() { - setName("MutableFloatStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableFloatStruct::getMaxCdrSerializedSize()); -#else - MutableFloatStruct_max_cdr_typesize; -#endif + set_name("MutableFloatStruct"); + uint32_t type_size = MutableFloatStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableFloatStruct_max_key_cdr_typesize > 16 ? MutableFloatStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableFloatStruct_max_key_cdr_typesize > 16 ? MutableFloatStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableFloatStructPubSubType::~MutableFloatStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool MutableFloatStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool MutableFloatStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool MutableFloatStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool MutableFloatStructPubSubType::deserialize( return true; } -std::function MutableFloatStructPubSubType::getSerializedSizeProvider( +uint32_t MutableFloatStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableFloatStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableFloatStructPubSubType::create_data() { return reinterpret_cast(new MutableFloatStruct()); } -void MutableFloatStructPubSubType::deleteData( +void MutableFloatStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableFloatStructPubSubType::getKey( +bool MutableFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool MutableFloatStructPubSubType::getKey( const MutableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableFloatStruct_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 || MutableFloatStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void MutableFloatStructPubSubType::register_type_object_representation() MutableDoubleStructPubSubType::MutableDoubleStructPubSubType() { - setName("MutableDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableDoubleStruct::getMaxCdrSerializedSize()); -#else - MutableDoubleStruct_max_cdr_typesize; -#endif + set_name("MutableDoubleStruct"); + uint32_t type_size = MutableDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableDoubleStruct_max_key_cdr_typesize > 16 ? MutableDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableDoubleStruct_max_key_cdr_typesize > 16 ? MutableDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableDoubleStructPubSubType::~MutableDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool MutableDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool MutableDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool MutableDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool MutableDoubleStructPubSubType::deserialize( return true; } -std::function MutableDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t MutableDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableDoubleStructPubSubType::create_data() { return reinterpret_cast(new MutableDoubleStruct()); } -void MutableDoubleStructPubSubType::deleteData( +void MutableDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableDoubleStructPubSubType::getKey( +bool MutableDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool MutableDoubleStructPubSubType::getKey( const MutableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableDoubleStruct_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 || MutableDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void MutableDoubleStructPubSubType::register_type_object_representation() MutableLongDoubleStructPubSubType::MutableLongDoubleStructPubSubType() { - setName("MutableLongDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableLongDoubleStruct::getMaxCdrSerializedSize()); -#else - MutableLongDoubleStruct_max_cdr_typesize; -#endif + set_name("MutableLongDoubleStruct"); + uint32_t type_size = MutableLongDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableLongDoubleStruct_max_key_cdr_typesize > 16 ? MutableLongDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableLongDoubleStruct_max_key_cdr_typesize > 16 ? MutableLongDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableLongDoubleStructPubSubType::~MutableLongDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool MutableLongDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool MutableLongDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool MutableLongDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool MutableLongDoubleStructPubSubType::deserialize( return true; } -std::function MutableLongDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t MutableLongDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableLongDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableLongDoubleStructPubSubType::create_data() { return reinterpret_cast(new MutableLongDoubleStruct()); } -void MutableLongDoubleStructPubSubType::deleteData( +void MutableLongDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableLongDoubleStructPubSubType::getKey( +bool MutableLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool MutableLongDoubleStructPubSubType::getKey( const MutableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableLongDoubleStruct_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 || MutableLongDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void MutableLongDoubleStructPubSubType::register_type_object_representation() MutableBooleanStructPubSubType::MutableBooleanStructPubSubType() { - setName("MutableBooleanStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableBooleanStruct::getMaxCdrSerializedSize()); -#else - MutableBooleanStruct_max_cdr_typesize; -#endif + set_name("MutableBooleanStruct"); + uint32_t type_size = MutableBooleanStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableBooleanStruct_max_key_cdr_typesize > 16 ? MutableBooleanStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableBooleanStruct_max_key_cdr_typesize > 16 ? MutableBooleanStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableBooleanStructPubSubType::~MutableBooleanStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool MutableBooleanStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool MutableBooleanStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool MutableBooleanStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool MutableBooleanStructPubSubType::deserialize( return true; } -std::function MutableBooleanStructPubSubType::getSerializedSizeProvider( +uint32_t MutableBooleanStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableBooleanStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableBooleanStructPubSubType::create_data() { return reinterpret_cast(new MutableBooleanStruct()); } -void MutableBooleanStructPubSubType::deleteData( +void MutableBooleanStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableBooleanStructPubSubType::getKey( +bool MutableBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool MutableBooleanStructPubSubType::getKey( const MutableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableBooleanStruct_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 || MutableBooleanStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void MutableBooleanStructPubSubType::register_type_object_representation() MutableOctetStructPubSubType::MutableOctetStructPubSubType() { - setName("MutableOctetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableOctetStruct::getMaxCdrSerializedSize()); -#else - MutableOctetStruct_max_cdr_typesize; -#endif + set_name("MutableOctetStruct"); + uint32_t type_size = MutableOctetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableOctetStruct_max_key_cdr_typesize > 16 ? MutableOctetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableOctetStruct_max_key_cdr_typesize > 16 ? MutableOctetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableOctetStructPubSubType::~MutableOctetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool MutableOctetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool MutableOctetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool MutableOctetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool MutableOctetStructPubSubType::deserialize( return true; } -std::function MutableOctetStructPubSubType::getSerializedSizeProvider( +uint32_t MutableOctetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableOctetStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableOctetStructPubSubType::create_data() { return reinterpret_cast(new MutableOctetStruct()); } -void MutableOctetStructPubSubType::deleteData( +void MutableOctetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableOctetStructPubSubType::getKey( +bool MutableOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool MutableOctetStructPubSubType::getKey( const MutableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableOctetStruct_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 || MutableOctetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void MutableOctetStructPubSubType::register_type_object_representation() MutableCharStructPubSubType::MutableCharStructPubSubType() { - setName("MutableCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableCharStruct::getMaxCdrSerializedSize()); -#else - MutableCharStruct_max_cdr_typesize; -#endif + set_name("MutableCharStruct"); + uint32_t type_size = MutableCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableCharStruct_max_key_cdr_typesize > 16 ? MutableCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableCharStruct_max_key_cdr_typesize > 16 ? MutableCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableCharStructPubSubType::~MutableCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool MutableCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool MutableCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool MutableCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool MutableCharStructPubSubType::deserialize( return true; } -std::function MutableCharStructPubSubType::getSerializedSizeProvider( +uint32_t MutableCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableCharStructPubSubType::create_data() { return reinterpret_cast(new MutableCharStruct()); } -void MutableCharStructPubSubType::deleteData( +void MutableCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableCharStructPubSubType::getKey( +bool MutableCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool MutableCharStructPubSubType::getKey( const MutableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableCharStruct_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 || MutableCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void MutableCharStructPubSubType::register_type_object_representation() MutableWCharStructPubSubType::MutableWCharStructPubSubType() { - setName("MutableWCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableWCharStruct::getMaxCdrSerializedSize()); -#else - MutableWCharStruct_max_cdr_typesize; -#endif + set_name("MutableWCharStruct"); + uint32_t type_size = MutableWCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableWCharStruct_max_key_cdr_typesize > 16 ? MutableWCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableWCharStruct_max_key_cdr_typesize > 16 ? MutableWCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableWCharStructPubSubType::~MutableWCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool MutableWCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool MutableWCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool MutableWCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool MutableWCharStructPubSubType::deserialize( return true; } -std::function MutableWCharStructPubSubType::getSerializedSizeProvider( +uint32_t MutableWCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableWCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableWCharStructPubSubType::create_data() { return reinterpret_cast(new MutableWCharStruct()); } -void MutableWCharStructPubSubType::deleteData( +void MutableWCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableWCharStructPubSubType::getKey( +bool MutableWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool MutableWCharStructPubSubType::getKey( const MutableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableWCharStruct_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 || MutableWCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void MutableWCharStructPubSubType::register_type_object_representation() MutableUnionStructPubSubType::MutableUnionStructPubSubType() { - setName("MutableUnionStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableUnionStruct::getMaxCdrSerializedSize()); -#else - MutableUnionStruct_max_cdr_typesize; -#endif + set_name("MutableUnionStruct"); + uint32_t type_size = MutableUnionStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableUnionStruct_max_key_cdr_typesize > 16 ? MutableUnionStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableUnionStruct_max_key_cdr_typesize > 16 ? MutableUnionStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableUnionStructPubSubType::~MutableUnionStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool MutableUnionStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool MutableUnionStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool MutableUnionStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool MutableUnionStructPubSubType::deserialize( return true; } -std::function MutableUnionStructPubSubType::getSerializedSizeProvider( +uint32_t MutableUnionStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableUnionStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableUnionStructPubSubType::create_data() { return reinterpret_cast(new MutableUnionStruct()); } -void MutableUnionStructPubSubType::deleteData( +void MutableUnionStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableUnionStructPubSubType::getKey( +bool MutableUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool MutableUnionStructPubSubType::getKey( const MutableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableUnionStruct_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 || MutableUnionStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void MutableUnionStructPubSubType::register_type_object_representation() MutableEmptyStructPubSubType::MutableEmptyStructPubSubType() { - setName("MutableEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableEmptyStruct::getMaxCdrSerializedSize()); -#else - MutableEmptyStruct_max_cdr_typesize; -#endif + set_name("MutableEmptyStruct"); + uint32_t type_size = MutableEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableEmptyStruct_max_key_cdr_typesize > 16 ? MutableEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableEmptyStruct_max_key_cdr_typesize > 16 ? MutableEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableEmptyStructPubSubType::~MutableEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool MutableEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool MutableEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool MutableEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool MutableEmptyStructPubSubType::deserialize( return true; } -std::function MutableEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t MutableEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableEmptyStructPubSubType::create_data() { return reinterpret_cast(new MutableEmptyStruct()); } -void MutableEmptyStructPubSubType::deleteData( +void MutableEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableEmptyStructPubSubType::getKey( +bool MutableEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool MutableEmptyStructPubSubType::getKey( const MutableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableEmptyStruct_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 || MutableEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void MutableEmptyStructPubSubType::register_type_object_representation() MutableEmptyInheritanceStructPubSubType::MutableEmptyInheritanceStructPubSubType() { - setName("MutableEmptyInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableEmptyInheritanceStruct::getMaxCdrSerializedSize()); -#else - MutableEmptyInheritanceStruct_max_cdr_typesize; -#endif + set_name("MutableEmptyInheritanceStruct"); + uint32_t type_size = MutableEmptyInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? MutableEmptyInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableEmptyInheritanceStruct_max_key_cdr_typesize > 16 ? MutableEmptyInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableEmptyInheritanceStructPubSubType::~MutableEmptyInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool MutableEmptyInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool MutableEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool MutableEmptyInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool MutableEmptyInheritanceStructPubSubType::deserialize( return true; } -std::function MutableEmptyInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t MutableEmptyInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableEmptyInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableEmptyInheritanceStructPubSubType::create_data() { return reinterpret_cast(new MutableEmptyInheritanceStruct()); } -void MutableEmptyInheritanceStructPubSubType::deleteData( +void MutableEmptyInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableEmptyInheritanceStructPubSubType::getKey( +bool MutableEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool MutableEmptyInheritanceStructPubSubType::getKey( const MutableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableEmptyInheritanceStruct_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 || MutableEmptyInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void MutableEmptyInheritanceStructPubSubType::register_type_object_representatio MutableInheritanceStructPubSubType::MutableInheritanceStructPubSubType() { - setName("MutableInheritanceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableInheritanceStruct::getMaxCdrSerializedSize()); -#else - MutableInheritanceStruct_max_cdr_typesize; -#endif + set_name("MutableInheritanceStruct"); + uint32_t type_size = MutableInheritanceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableInheritanceStruct_max_key_cdr_typesize > 16 ? MutableInheritanceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableInheritanceStruct_max_key_cdr_typesize > 16 ? MutableInheritanceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableInheritanceStructPubSubType::~MutableInheritanceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool MutableInheritanceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool MutableInheritanceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool MutableInheritanceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool MutableInheritanceStructPubSubType::deserialize( return true; } -std::function MutableInheritanceStructPubSubType::getSerializedSizeProvider( +uint32_t MutableInheritanceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableInheritanceStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableInheritanceStructPubSubType::create_data() { return reinterpret_cast(new MutableInheritanceStruct()); } -void MutableInheritanceStructPubSubType::deleteData( +void MutableInheritanceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableInheritanceStructPubSubType::getKey( +bool MutableInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool MutableInheritanceStructPubSubType::getKey( const MutableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableInheritanceStruct_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 || MutableInheritanceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void MutableInheritanceStructPubSubType::register_type_object_representation() MutableInheritanceEmptyStructPubSubType::MutableInheritanceEmptyStructPubSubType() { - setName("MutableInheritanceEmptyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableInheritanceEmptyStruct::getMaxCdrSerializedSize()); -#else - MutableInheritanceEmptyStruct_max_cdr_typesize; -#endif + set_name("MutableInheritanceEmptyStruct"); + uint32_t type_size = MutableInheritanceEmptyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableInheritanceEmptyStruct_max_key_cdr_typesize > 16 ? MutableInheritanceEmptyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableInheritanceEmptyStruct_max_key_cdr_typesize > 16 ? MutableInheritanceEmptyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableInheritanceEmptyStructPubSubType::~MutableInheritanceEmptyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool MutableInheritanceEmptyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool MutableInheritanceEmptyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool MutableInheritanceEmptyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool MutableInheritanceEmptyStructPubSubType::deserialize( return true; } -std::function MutableInheritanceEmptyStructPubSubType::getSerializedSizeProvider( +uint32_t MutableInheritanceEmptyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableInheritanceEmptyStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableInheritanceEmptyStructPubSubType::create_data() { return reinterpret_cast(new MutableInheritanceEmptyStruct()); } -void MutableInheritanceEmptyStructPubSubType::deleteData( +void MutableInheritanceEmptyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableInheritanceEmptyStructPubSubType::getKey( +bool MutableInheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool MutableInheritanceEmptyStructPubSubType::getKey( const MutableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableInheritanceEmptyStruct_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 || MutableInheritanceEmptyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void MutableInheritanceEmptyStructPubSubType::register_type_object_representatio MutableExtensibilityInheritancePubSubType::MutableExtensibilityInheritancePubSubType() { - setName("MutableExtensibilityInheritance"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableExtensibilityInheritance::getMaxCdrSerializedSize()); -#else - MutableExtensibilityInheritance_max_cdr_typesize; -#endif + set_name("MutableExtensibilityInheritance"); + uint32_t type_size = MutableExtensibilityInheritance_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableExtensibilityInheritance_max_key_cdr_typesize > 16 ? MutableExtensibilityInheritance_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableExtensibilityInheritance_max_key_cdr_typesize > 16 ? MutableExtensibilityInheritance_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableExtensibilityInheritancePubSubType::~MutableExtensibilityInheritancePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool MutableExtensibilityInheritancePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool MutableExtensibilityInheritancePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool MutableExtensibilityInheritancePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool MutableExtensibilityInheritancePubSubType::deserialize( return true; } -std::function MutableExtensibilityInheritancePubSubType::getSerializedSizeProvider( +uint32_t MutableExtensibilityInheritancePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableExtensibilityInheritancePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableExtensibilityInheritancePubSubType::create_data() { return reinterpret_cast(new MutableExtensibilityInheritance()); } -void MutableExtensibilityInheritancePubSubType::deleteData( +void MutableExtensibilityInheritancePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableExtensibilityInheritancePubSubType::getKey( +bool MutableExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool MutableExtensibilityInheritancePubSubType::getKey( const MutableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableExtensibilityInheritance_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 || MutableExtensibilityInheritance_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index f166c710663..c499d6b82bc 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -62,18 +62,18 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/optionalPubSubTypes.cxx b/test/dds-types-test/optionalPubSubTypes.cxx index 9ecfe9f8a92..e74474e2804 100644 --- a/test/dds-types-test/optionalPubSubTypes.cxx +++ b/test/dds-types-test/optionalPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; short_optionalPubSubType::short_optionalPubSubType() { - setName("short_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(short_optional::getMaxCdrSerializedSize()); -#else - short_optional_max_cdr_typesize; -#endif + set_name("short_optional"); + uint32_t type_size = short_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = short_optional_max_key_cdr_typesize > 16 ? short_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = short_optional_max_key_cdr_typesize > 16 ? short_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } short_optionalPubSubType::~short_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool short_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool short_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool short_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool short_optionalPubSubType::deserialize( return true; } -std::function short_optionalPubSubType::getSerializedSizeProvider( +uint32_t short_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* short_optionalPubSubType::createData() +void* short_optionalPubSubType::create_data() { return reinterpret_cast(new short_optional()); } -void short_optionalPubSubType::deleteData( +void short_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool short_optionalPubSubType::getKey( +bool short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool short_optionalPubSubType::getKey( const short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), short_optional_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 || short_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void short_optionalPubSubType::register_type_object_representation() ushort_optionalPubSubType::ushort_optionalPubSubType() { - setName("ushort_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ushort_optional::getMaxCdrSerializedSize()); -#else - ushort_optional_max_cdr_typesize; -#endif + set_name("ushort_optional"); + uint32_t type_size = ushort_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ushort_optional_max_key_cdr_typesize > 16 ? ushort_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ushort_optional_max_key_cdr_typesize > 16 ? ushort_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ushort_optionalPubSubType::~ushort_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool ushort_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool ushort_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool ushort_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool ushort_optionalPubSubType::deserialize( return true; } -std::function ushort_optionalPubSubType::getSerializedSizeProvider( +uint32_t ushort_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ushort_optionalPubSubType::createData() +void* ushort_optionalPubSubType::create_data() { return reinterpret_cast(new ushort_optional()); } -void ushort_optionalPubSubType::deleteData( +void ushort_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ushort_optionalPubSubType::getKey( +bool ushort_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool ushort_optionalPubSubType::getKey( const ushort_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ushort_optional_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 || ushort_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void ushort_optionalPubSubType::register_type_object_representation() long_optionalPubSubType::long_optionalPubSubType() { - setName("long_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(long_optional::getMaxCdrSerializedSize()); -#else - long_optional_max_cdr_typesize; -#endif + set_name("long_optional"); + uint32_t type_size = long_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = long_optional_max_key_cdr_typesize > 16 ? long_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = long_optional_max_key_cdr_typesize > 16 ? long_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } long_optionalPubSubType::~long_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool long_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool long_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool long_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool long_optionalPubSubType::deserialize( return true; } -std::function long_optionalPubSubType::getSerializedSizeProvider( +uint32_t long_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* long_optionalPubSubType::createData() +void* long_optionalPubSubType::create_data() { return reinterpret_cast(new long_optional()); } -void long_optionalPubSubType::deleteData( +void long_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool long_optionalPubSubType::getKey( +bool long_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool long_optionalPubSubType::getKey( const long_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), long_optional_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 || long_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void long_optionalPubSubType::register_type_object_representation() ulong_optionalPubSubType::ulong_optionalPubSubType() { - setName("ulong_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulong_optional::getMaxCdrSerializedSize()); -#else - ulong_optional_max_cdr_typesize; -#endif + set_name("ulong_optional"); + uint32_t type_size = ulong_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulong_optional_max_key_cdr_typesize > 16 ? ulong_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulong_optional_max_key_cdr_typesize > 16 ? ulong_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulong_optionalPubSubType::~ulong_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool ulong_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool ulong_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool ulong_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool ulong_optionalPubSubType::deserialize( return true; } -std::function ulong_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulong_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulong_optionalPubSubType::createData() +void* ulong_optionalPubSubType::create_data() { return reinterpret_cast(new ulong_optional()); } -void ulong_optionalPubSubType::deleteData( +void ulong_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulong_optionalPubSubType::getKey( +bool ulong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool ulong_optionalPubSubType::getKey( const ulong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulong_optional_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 || ulong_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void ulong_optionalPubSubType::register_type_object_representation() longlong_optionalPubSubType::longlong_optionalPubSubType() { - setName("longlong_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longlong_optional::getMaxCdrSerializedSize()); -#else - longlong_optional_max_cdr_typesize; -#endif + set_name("longlong_optional"); + uint32_t type_size = longlong_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longlong_optional_max_key_cdr_typesize > 16 ? longlong_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longlong_optional_max_key_cdr_typesize > 16 ? longlong_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longlong_optionalPubSubType::~longlong_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool longlong_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool longlong_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool longlong_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool longlong_optionalPubSubType::deserialize( return true; } -std::function longlong_optionalPubSubType::getSerializedSizeProvider( +uint32_t longlong_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longlong_optionalPubSubType::createData() +void* longlong_optionalPubSubType::create_data() { return reinterpret_cast(new longlong_optional()); } -void longlong_optionalPubSubType::deleteData( +void longlong_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longlong_optionalPubSubType::getKey( +bool longlong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool longlong_optionalPubSubType::getKey( const longlong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longlong_optional_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 || longlong_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void longlong_optionalPubSubType::register_type_object_representation() ulonglong_optionalPubSubType::ulonglong_optionalPubSubType() { - setName("ulonglong_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulonglong_optional::getMaxCdrSerializedSize()); -#else - ulonglong_optional_max_cdr_typesize; -#endif + set_name("ulonglong_optional"); + uint32_t type_size = ulonglong_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulonglong_optional_max_key_cdr_typesize > 16 ? ulonglong_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulonglong_optional_max_key_cdr_typesize > 16 ? ulonglong_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulonglong_optionalPubSubType::~ulonglong_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool ulonglong_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool ulonglong_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool ulonglong_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool ulonglong_optionalPubSubType::deserialize( return true; } -std::function ulonglong_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulonglong_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulonglong_optionalPubSubType::createData() +void* ulonglong_optionalPubSubType::create_data() { return reinterpret_cast(new ulonglong_optional()); } -void ulonglong_optionalPubSubType::deleteData( +void ulonglong_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulonglong_optionalPubSubType::getKey( +bool ulonglong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool ulonglong_optionalPubSubType::getKey( const ulonglong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulonglong_optional_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 || ulonglong_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void ulonglong_optionalPubSubType::register_type_object_representation() float_optionalPubSubType::float_optionalPubSubType() { - setName("float_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(float_optional::getMaxCdrSerializedSize()); -#else - float_optional_max_cdr_typesize; -#endif + set_name("float_optional"); + uint32_t type_size = float_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = float_optional_max_key_cdr_typesize > 16 ? float_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = float_optional_max_key_cdr_typesize > 16 ? float_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } float_optionalPubSubType::~float_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool float_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool float_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool float_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool float_optionalPubSubType::deserialize( return true; } -std::function float_optionalPubSubType::getSerializedSizeProvider( +uint32_t float_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* float_optionalPubSubType::createData() +void* float_optionalPubSubType::create_data() { return reinterpret_cast(new float_optional()); } -void float_optionalPubSubType::deleteData( +void float_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool float_optionalPubSubType::getKey( +bool float_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool float_optionalPubSubType::getKey( const float_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), float_optional_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 || float_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void float_optionalPubSubType::register_type_object_representation() double_optionalPubSubType::double_optionalPubSubType() { - setName("double_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(double_optional::getMaxCdrSerializedSize()); -#else - double_optional_max_cdr_typesize; -#endif + set_name("double_optional"); + uint32_t type_size = double_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = double_optional_max_key_cdr_typesize > 16 ? double_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = double_optional_max_key_cdr_typesize > 16 ? double_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } double_optionalPubSubType::~double_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool double_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool double_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool double_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool double_optionalPubSubType::deserialize( return true; } -std::function double_optionalPubSubType::getSerializedSizeProvider( +uint32_t double_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* double_optionalPubSubType::createData() +void* double_optionalPubSubType::create_data() { return reinterpret_cast(new double_optional()); } -void double_optionalPubSubType::deleteData( +void double_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool double_optionalPubSubType::getKey( +bool double_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool double_optionalPubSubType::getKey( const double_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), double_optional_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 || double_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void double_optionalPubSubType::register_type_object_representation() longdouble_optionalPubSubType::longdouble_optionalPubSubType() { - setName("longdouble_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longdouble_optional::getMaxCdrSerializedSize()); -#else - longdouble_optional_max_cdr_typesize; -#endif + set_name("longdouble_optional"); + uint32_t type_size = longdouble_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longdouble_optional_max_key_cdr_typesize > 16 ? longdouble_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longdouble_optional_max_key_cdr_typesize > 16 ? longdouble_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longdouble_optionalPubSubType::~longdouble_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool longdouble_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool longdouble_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool longdouble_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool longdouble_optionalPubSubType::deserialize( return true; } -std::function longdouble_optionalPubSubType::getSerializedSizeProvider( +uint32_t longdouble_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longdouble_optionalPubSubType::createData() +void* longdouble_optionalPubSubType::create_data() { return reinterpret_cast(new longdouble_optional()); } -void longdouble_optionalPubSubType::deleteData( +void longdouble_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longdouble_optionalPubSubType::getKey( +bool longdouble_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool longdouble_optionalPubSubType::getKey( const longdouble_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longdouble_optional_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 || longdouble_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void longdouble_optionalPubSubType::register_type_object_representation() boolean_optionalPubSubType::boolean_optionalPubSubType() { - setName("boolean_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(boolean_optional::getMaxCdrSerializedSize()); -#else - boolean_optional_max_cdr_typesize; -#endif + set_name("boolean_optional"); + uint32_t type_size = boolean_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = boolean_optional_max_key_cdr_typesize > 16 ? boolean_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = boolean_optional_max_key_cdr_typesize > 16 ? boolean_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } boolean_optionalPubSubType::~boolean_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool boolean_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool boolean_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool boolean_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool boolean_optionalPubSubType::deserialize( return true; } -std::function boolean_optionalPubSubType::getSerializedSizeProvider( +uint32_t boolean_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* boolean_optionalPubSubType::createData() +void* boolean_optionalPubSubType::create_data() { return reinterpret_cast(new boolean_optional()); } -void boolean_optionalPubSubType::deleteData( +void boolean_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool boolean_optionalPubSubType::getKey( +bool boolean_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool boolean_optionalPubSubType::getKey( const boolean_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), boolean_optional_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 || boolean_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void boolean_optionalPubSubType::register_type_object_representation() octet_optionalPubSubType::octet_optionalPubSubType() { - setName("octet_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(octet_optional::getMaxCdrSerializedSize()); -#else - octet_optional_max_cdr_typesize; -#endif + set_name("octet_optional"); + uint32_t type_size = octet_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = octet_optional_max_key_cdr_typesize > 16 ? octet_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = octet_optional_max_key_cdr_typesize > 16 ? octet_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } octet_optionalPubSubType::~octet_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool octet_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool octet_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool octet_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool octet_optionalPubSubType::deserialize( return true; } -std::function octet_optionalPubSubType::getSerializedSizeProvider( +uint32_t octet_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* octet_optionalPubSubType::createData() +void* octet_optionalPubSubType::create_data() { return reinterpret_cast(new octet_optional()); } -void octet_optionalPubSubType::deleteData( +void octet_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool octet_optionalPubSubType::getKey( +bool octet_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool octet_optionalPubSubType::getKey( const octet_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), octet_optional_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 || octet_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void octet_optionalPubSubType::register_type_object_representation() char_optionalPubSubType::char_optionalPubSubType() { - setName("char_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(char_optional::getMaxCdrSerializedSize()); -#else - char_optional_max_cdr_typesize; -#endif + set_name("char_optional"); + uint32_t type_size = char_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = char_optional_max_key_cdr_typesize > 16 ? char_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = char_optional_max_key_cdr_typesize > 16 ? char_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } char_optionalPubSubType::~char_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool char_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool char_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool char_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool char_optionalPubSubType::deserialize( return true; } -std::function char_optionalPubSubType::getSerializedSizeProvider( +uint32_t char_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* char_optionalPubSubType::createData() +void* char_optionalPubSubType::create_data() { return reinterpret_cast(new char_optional()); } -void char_optionalPubSubType::deleteData( +void char_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool char_optionalPubSubType::getKey( +bool char_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool char_optionalPubSubType::getKey( const char_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), char_optional_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 || char_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void char_optionalPubSubType::register_type_object_representation() wchar_optionalPubSubType::wchar_optionalPubSubType() { - setName("wchar_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(wchar_optional::getMaxCdrSerializedSize()); -#else - wchar_optional_max_cdr_typesize; -#endif + set_name("wchar_optional"); + uint32_t type_size = wchar_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = wchar_optional_max_key_cdr_typesize > 16 ? wchar_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = wchar_optional_max_key_cdr_typesize > 16 ? wchar_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } wchar_optionalPubSubType::~wchar_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool wchar_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool wchar_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool wchar_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool wchar_optionalPubSubType::deserialize( return true; } -std::function wchar_optionalPubSubType::getSerializedSizeProvider( +uint32_t wchar_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* wchar_optionalPubSubType::createData() +void* wchar_optionalPubSubType::create_data() { return reinterpret_cast(new wchar_optional()); } -void wchar_optionalPubSubType::deleteData( +void wchar_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool wchar_optionalPubSubType::getKey( +bool wchar_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool wchar_optionalPubSubType::getKey( const wchar_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), wchar_optional_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 || wchar_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void wchar_optionalPubSubType::register_type_object_representation() short_align_1_optionalPubSubType::short_align_1_optionalPubSubType() { - setName("short_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(short_align_1_optional::getMaxCdrSerializedSize()); -#else - short_align_1_optional_max_cdr_typesize; -#endif + set_name("short_align_1_optional"); + uint32_t type_size = short_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = short_align_1_optional_max_key_cdr_typesize > 16 ? short_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = short_align_1_optional_max_key_cdr_typesize > 16 ? short_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } short_align_1_optionalPubSubType::~short_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool short_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool short_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool short_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool short_align_1_optionalPubSubType::deserialize( return true; } -std::function short_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t short_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* short_align_1_optionalPubSubType::createData() +void* short_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new short_align_1_optional()); } -void short_align_1_optionalPubSubType::deleteData( +void short_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool short_align_1_optionalPubSubType::getKey( +bool short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool short_align_1_optionalPubSubType::getKey( const short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), short_align_1_optional_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 || short_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void short_align_1_optionalPubSubType::register_type_object_representation() short_align_2_optionalPubSubType::short_align_2_optionalPubSubType() { - setName("short_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(short_align_2_optional::getMaxCdrSerializedSize()); -#else - short_align_2_optional_max_cdr_typesize; -#endif + set_name("short_align_2_optional"); + uint32_t type_size = short_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = short_align_2_optional_max_key_cdr_typesize > 16 ? short_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = short_align_2_optional_max_key_cdr_typesize > 16 ? short_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } short_align_2_optionalPubSubType::~short_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool short_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool short_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool short_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool short_align_2_optionalPubSubType::deserialize( return true; } -std::function short_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t short_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* short_align_2_optionalPubSubType::createData() +void* short_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new short_align_2_optional()); } -void short_align_2_optionalPubSubType::deleteData( +void short_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool short_align_2_optionalPubSubType::getKey( +bool short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool short_align_2_optionalPubSubType::getKey( const short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), short_align_2_optional_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 || short_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void short_align_2_optionalPubSubType::register_type_object_representation() short_align_4_optionalPubSubType::short_align_4_optionalPubSubType() { - setName("short_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(short_align_4_optional::getMaxCdrSerializedSize()); -#else - short_align_4_optional_max_cdr_typesize; -#endif + set_name("short_align_4_optional"); + uint32_t type_size = short_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = short_align_4_optional_max_key_cdr_typesize > 16 ? short_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = short_align_4_optional_max_key_cdr_typesize > 16 ? short_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } short_align_4_optionalPubSubType::~short_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool short_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool short_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool short_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool short_align_4_optionalPubSubType::deserialize( return true; } -std::function short_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t short_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* short_align_4_optionalPubSubType::createData() +void* short_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new short_align_4_optional()); } -void short_align_4_optionalPubSubType::deleteData( +void short_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool short_align_4_optionalPubSubType::getKey( +bool short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool short_align_4_optionalPubSubType::getKey( const short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), short_align_4_optional_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 || short_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void short_align_4_optionalPubSubType::register_type_object_representation() ushort_align_1_optionalPubSubType::ushort_align_1_optionalPubSubType() { - setName("ushort_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ushort_align_1_optional::getMaxCdrSerializedSize()); -#else - ushort_align_1_optional_max_cdr_typesize; -#endif + set_name("ushort_align_1_optional"); + uint32_t type_size = ushort_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ushort_align_1_optional_max_key_cdr_typesize > 16 ? ushort_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ushort_align_1_optional_max_key_cdr_typesize > 16 ? ushort_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ushort_align_1_optionalPubSubType::~ushort_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool ushort_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool ushort_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool ushort_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool ushort_align_1_optionalPubSubType::deserialize( return true; } -std::function ushort_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t ushort_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ushort_align_1_optionalPubSubType::createData() +void* ushort_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new ushort_align_1_optional()); } -void ushort_align_1_optionalPubSubType::deleteData( +void ushort_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ushort_align_1_optionalPubSubType::getKey( +bool ushort_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool ushort_align_1_optionalPubSubType::getKey( const ushort_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ushort_align_1_optional_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 || ushort_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void ushort_align_1_optionalPubSubType::register_type_object_representation() ushort_align_2_optionalPubSubType::ushort_align_2_optionalPubSubType() { - setName("ushort_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ushort_align_2_optional::getMaxCdrSerializedSize()); -#else - ushort_align_2_optional_max_cdr_typesize; -#endif + set_name("ushort_align_2_optional"); + uint32_t type_size = ushort_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ushort_align_2_optional_max_key_cdr_typesize > 16 ? ushort_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ushort_align_2_optional_max_key_cdr_typesize > 16 ? ushort_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ushort_align_2_optionalPubSubType::~ushort_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool ushort_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool ushort_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool ushort_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool ushort_align_2_optionalPubSubType::deserialize( return true; } -std::function ushort_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t ushort_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ushort_align_2_optionalPubSubType::createData() +void* ushort_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new ushort_align_2_optional()); } -void ushort_align_2_optionalPubSubType::deleteData( +void ushort_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ushort_align_2_optionalPubSubType::getKey( +bool ushort_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool ushort_align_2_optionalPubSubType::getKey( const ushort_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ushort_align_2_optional_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 || ushort_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void ushort_align_2_optionalPubSubType::register_type_object_representation() ushort_align_4_optionalPubSubType::ushort_align_4_optionalPubSubType() { - setName("ushort_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ushort_align_4_optional::getMaxCdrSerializedSize()); -#else - ushort_align_4_optional_max_cdr_typesize; -#endif + set_name("ushort_align_4_optional"); + uint32_t type_size = ushort_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ushort_align_4_optional_max_key_cdr_typesize > 16 ? ushort_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ushort_align_4_optional_max_key_cdr_typesize > 16 ? ushort_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ushort_align_4_optionalPubSubType::~ushort_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool ushort_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool ushort_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool ushort_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool ushort_align_4_optionalPubSubType::deserialize( return true; } -std::function ushort_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t ushort_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ushort_align_4_optionalPubSubType::createData() +void* ushort_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new ushort_align_4_optional()); } -void ushort_align_4_optionalPubSubType::deleteData( +void ushort_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ushort_align_4_optionalPubSubType::getKey( +bool ushort_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool ushort_align_4_optionalPubSubType::getKey( const ushort_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ushort_align_4_optional_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 || ushort_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void ushort_align_4_optionalPubSubType::register_type_object_representation() long_align_1_optionalPubSubType::long_align_1_optionalPubSubType() { - setName("long_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(long_align_1_optional::getMaxCdrSerializedSize()); -#else - long_align_1_optional_max_cdr_typesize; -#endif + set_name("long_align_1_optional"); + uint32_t type_size = long_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = long_align_1_optional_max_key_cdr_typesize > 16 ? long_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = long_align_1_optional_max_key_cdr_typesize > 16 ? long_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } long_align_1_optionalPubSubType::~long_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool long_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool long_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool long_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool long_align_1_optionalPubSubType::deserialize( return true; } -std::function long_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t long_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* long_align_1_optionalPubSubType::createData() +void* long_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new long_align_1_optional()); } -void long_align_1_optionalPubSubType::deleteData( +void long_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool long_align_1_optionalPubSubType::getKey( +bool long_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool long_align_1_optionalPubSubType::getKey( const long_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), long_align_1_optional_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 || long_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void long_align_1_optionalPubSubType::register_type_object_representation() long_align_2_optionalPubSubType::long_align_2_optionalPubSubType() { - setName("long_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(long_align_2_optional::getMaxCdrSerializedSize()); -#else - long_align_2_optional_max_cdr_typesize; -#endif + set_name("long_align_2_optional"); + uint32_t type_size = long_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = long_align_2_optional_max_key_cdr_typesize > 16 ? long_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = long_align_2_optional_max_key_cdr_typesize > 16 ? long_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } long_align_2_optionalPubSubType::~long_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool long_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool long_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool long_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool long_align_2_optionalPubSubType::deserialize( return true; } -std::function long_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t long_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* long_align_2_optionalPubSubType::createData() +void* long_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new long_align_2_optional()); } -void long_align_2_optionalPubSubType::deleteData( +void long_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool long_align_2_optionalPubSubType::getKey( +bool long_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool long_align_2_optionalPubSubType::getKey( const long_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), long_align_2_optional_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 || long_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void long_align_2_optionalPubSubType::register_type_object_representation() long_align_4_optionalPubSubType::long_align_4_optionalPubSubType() { - setName("long_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(long_align_4_optional::getMaxCdrSerializedSize()); -#else - long_align_4_optional_max_cdr_typesize; -#endif + set_name("long_align_4_optional"); + uint32_t type_size = long_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = long_align_4_optional_max_key_cdr_typesize > 16 ? long_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = long_align_4_optional_max_key_cdr_typesize > 16 ? long_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } long_align_4_optionalPubSubType::~long_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool long_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool long_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool long_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool long_align_4_optionalPubSubType::deserialize( return true; } -std::function long_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t long_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* long_align_4_optionalPubSubType::createData() +void* long_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new long_align_4_optional()); } -void long_align_4_optionalPubSubType::deleteData( +void long_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool long_align_4_optionalPubSubType::getKey( +bool long_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool long_align_4_optionalPubSubType::getKey( const long_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), long_align_4_optional_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 || long_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void long_align_4_optionalPubSubType::register_type_object_representation() ulong_align_1_optionalPubSubType::ulong_align_1_optionalPubSubType() { - setName("ulong_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulong_align_1_optional::getMaxCdrSerializedSize()); -#else - ulong_align_1_optional_max_cdr_typesize; -#endif + set_name("ulong_align_1_optional"); + uint32_t type_size = ulong_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulong_align_1_optional_max_key_cdr_typesize > 16 ? ulong_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulong_align_1_optional_max_key_cdr_typesize > 16 ? ulong_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulong_align_1_optionalPubSubType::~ulong_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool ulong_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool ulong_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool ulong_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool ulong_align_1_optionalPubSubType::deserialize( return true; } -std::function ulong_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulong_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulong_align_1_optionalPubSubType::createData() +void* ulong_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new ulong_align_1_optional()); } -void ulong_align_1_optionalPubSubType::deleteData( +void ulong_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulong_align_1_optionalPubSubType::getKey( +bool ulong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool ulong_align_1_optionalPubSubType::getKey( const ulong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulong_align_1_optional_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 || ulong_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void ulong_align_1_optionalPubSubType::register_type_object_representation() ulong_align_2_optionalPubSubType::ulong_align_2_optionalPubSubType() { - setName("ulong_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulong_align_2_optional::getMaxCdrSerializedSize()); -#else - ulong_align_2_optional_max_cdr_typesize; -#endif + set_name("ulong_align_2_optional"); + uint32_t type_size = ulong_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulong_align_2_optional_max_key_cdr_typesize > 16 ? ulong_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulong_align_2_optional_max_key_cdr_typesize > 16 ? ulong_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulong_align_2_optionalPubSubType::~ulong_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool ulong_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool ulong_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool ulong_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool ulong_align_2_optionalPubSubType::deserialize( return true; } -std::function ulong_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulong_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulong_align_2_optionalPubSubType::createData() +void* ulong_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new ulong_align_2_optional()); } -void ulong_align_2_optionalPubSubType::deleteData( +void ulong_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulong_align_2_optionalPubSubType::getKey( +bool ulong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool ulong_align_2_optionalPubSubType::getKey( const ulong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulong_align_2_optional_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 || ulong_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void ulong_align_2_optionalPubSubType::register_type_object_representation() ulong_align_4_optionalPubSubType::ulong_align_4_optionalPubSubType() { - setName("ulong_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulong_align_4_optional::getMaxCdrSerializedSize()); -#else - ulong_align_4_optional_max_cdr_typesize; -#endif + set_name("ulong_align_4_optional"); + uint32_t type_size = ulong_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulong_align_4_optional_max_key_cdr_typesize > 16 ? ulong_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulong_align_4_optional_max_key_cdr_typesize > 16 ? ulong_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulong_align_4_optionalPubSubType::~ulong_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool ulong_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool ulong_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool ulong_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool ulong_align_4_optionalPubSubType::deserialize( return true; } -std::function ulong_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulong_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulong_align_4_optionalPubSubType::createData() +void* ulong_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new ulong_align_4_optional()); } -void ulong_align_4_optionalPubSubType::deleteData( +void ulong_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulong_align_4_optionalPubSubType::getKey( +bool ulong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool ulong_align_4_optionalPubSubType::getKey( const ulong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulong_align_4_optional_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 || ulong_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void ulong_align_4_optionalPubSubType::register_type_object_representation() longlong_align_1_optionalPubSubType::longlong_align_1_optionalPubSubType() { - setName("longlong_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longlong_align_1_optional::getMaxCdrSerializedSize()); -#else - longlong_align_1_optional_max_cdr_typesize; -#endif + set_name("longlong_align_1_optional"); + uint32_t type_size = longlong_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longlong_align_1_optional_max_key_cdr_typesize > 16 ? longlong_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longlong_align_1_optional_max_key_cdr_typesize > 16 ? longlong_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longlong_align_1_optionalPubSubType::~longlong_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool longlong_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool longlong_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool longlong_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool longlong_align_1_optionalPubSubType::deserialize( return true; } -std::function longlong_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t longlong_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longlong_align_1_optionalPubSubType::createData() +void* longlong_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new longlong_align_1_optional()); } -void longlong_align_1_optionalPubSubType::deleteData( +void longlong_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longlong_align_1_optionalPubSubType::getKey( +bool longlong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool longlong_align_1_optionalPubSubType::getKey( const longlong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longlong_align_1_optional_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 || longlong_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void longlong_align_1_optionalPubSubType::register_type_object_representation() longlong_align_2_optionalPubSubType::longlong_align_2_optionalPubSubType() { - setName("longlong_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longlong_align_2_optional::getMaxCdrSerializedSize()); -#else - longlong_align_2_optional_max_cdr_typesize; -#endif + set_name("longlong_align_2_optional"); + uint32_t type_size = longlong_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longlong_align_2_optional_max_key_cdr_typesize > 16 ? longlong_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longlong_align_2_optional_max_key_cdr_typesize > 16 ? longlong_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longlong_align_2_optionalPubSubType::~longlong_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool longlong_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool longlong_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool longlong_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool longlong_align_2_optionalPubSubType::deserialize( return true; } -std::function longlong_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t longlong_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longlong_align_2_optionalPubSubType::createData() +void* longlong_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new longlong_align_2_optional()); } -void longlong_align_2_optionalPubSubType::deleteData( +void longlong_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longlong_align_2_optionalPubSubType::getKey( +bool longlong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool longlong_align_2_optionalPubSubType::getKey( const longlong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longlong_align_2_optional_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 || longlong_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void longlong_align_2_optionalPubSubType::register_type_object_representation() longlong_align_4_optionalPubSubType::longlong_align_4_optionalPubSubType() { - setName("longlong_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longlong_align_4_optional::getMaxCdrSerializedSize()); -#else - longlong_align_4_optional_max_cdr_typesize; -#endif + set_name("longlong_align_4_optional"); + uint32_t type_size = longlong_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longlong_align_4_optional_max_key_cdr_typesize > 16 ? longlong_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longlong_align_4_optional_max_key_cdr_typesize > 16 ? longlong_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longlong_align_4_optionalPubSubType::~longlong_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool longlong_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool longlong_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool longlong_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool longlong_align_4_optionalPubSubType::deserialize( return true; } -std::function longlong_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t longlong_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longlong_align_4_optionalPubSubType::createData() +void* longlong_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new longlong_align_4_optional()); } -void longlong_align_4_optionalPubSubType::deleteData( +void longlong_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longlong_align_4_optionalPubSubType::getKey( +bool longlong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool longlong_align_4_optionalPubSubType::getKey( const longlong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longlong_align_4_optional_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 || longlong_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5437,26 +4541,21 @@ void longlong_align_4_optionalPubSubType::register_type_object_representation() ulonglong_align_1_optionalPubSubType::ulonglong_align_1_optionalPubSubType() { - setName("ulonglong_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulonglong_align_1_optional::getMaxCdrSerializedSize()); -#else - ulonglong_align_1_optional_max_cdr_typesize; -#endif + set_name("ulonglong_align_1_optional"); + uint32_t type_size = ulonglong_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulonglong_align_1_optional_max_key_cdr_typesize > 16 ? ulonglong_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulonglong_align_1_optional_max_key_cdr_typesize > 16 ? ulonglong_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulonglong_align_1_optionalPubSubType::~ulonglong_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5474,12 +4573,10 @@ bool ulonglong_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5494,11 +4591,7 @@ bool ulonglong_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5515,11 +4608,7 @@ bool ulonglong_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5536,52 +4625,43 @@ bool ulonglong_align_1_optionalPubSubType::deserialize( return true; } -std::function ulonglong_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulonglong_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulonglong_align_1_optionalPubSubType::createData() +void* ulonglong_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new ulonglong_align_1_optional()); } -void ulonglong_align_1_optionalPubSubType::deleteData( +void ulonglong_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulonglong_align_1_optionalPubSubType::getKey( +bool ulonglong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5589,35 +4669,27 @@ bool ulonglong_align_1_optionalPubSubType::getKey( const ulonglong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulonglong_align_1_optional_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 || ulonglong_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5630,26 +4702,21 @@ void ulonglong_align_1_optionalPubSubType::register_type_object_representation() ulonglong_align_2_optionalPubSubType::ulonglong_align_2_optionalPubSubType() { - setName("ulonglong_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulonglong_align_2_optional::getMaxCdrSerializedSize()); -#else - ulonglong_align_2_optional_max_cdr_typesize; -#endif + set_name("ulonglong_align_2_optional"); + uint32_t type_size = ulonglong_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulonglong_align_2_optional_max_key_cdr_typesize > 16 ? ulonglong_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulonglong_align_2_optional_max_key_cdr_typesize > 16 ? ulonglong_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulonglong_align_2_optionalPubSubType::~ulonglong_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5667,12 +4734,10 @@ bool ulonglong_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5687,11 +4752,7 @@ bool ulonglong_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5708,11 +4769,7 @@ bool ulonglong_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5729,52 +4786,43 @@ bool ulonglong_align_2_optionalPubSubType::deserialize( return true; } -std::function ulonglong_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulonglong_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulonglong_align_2_optionalPubSubType::createData() +void* ulonglong_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new ulonglong_align_2_optional()); } -void ulonglong_align_2_optionalPubSubType::deleteData( +void ulonglong_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulonglong_align_2_optionalPubSubType::getKey( +bool ulonglong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5782,35 +4830,27 @@ bool ulonglong_align_2_optionalPubSubType::getKey( const ulonglong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulonglong_align_2_optional_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 || ulonglong_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5823,26 +4863,21 @@ void ulonglong_align_2_optionalPubSubType::register_type_object_representation() ulonglong_align_4_optionalPubSubType::ulonglong_align_4_optionalPubSubType() { - setName("ulonglong_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ulonglong_align_4_optional::getMaxCdrSerializedSize()); -#else - ulonglong_align_4_optional_max_cdr_typesize; -#endif + set_name("ulonglong_align_4_optional"); + uint32_t type_size = ulonglong_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ulonglong_align_4_optional_max_key_cdr_typesize > 16 ? ulonglong_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ulonglong_align_4_optional_max_key_cdr_typesize > 16 ? ulonglong_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ulonglong_align_4_optionalPubSubType::~ulonglong_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5860,12 +4895,10 @@ bool ulonglong_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5880,11 +4913,7 @@ bool ulonglong_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5901,11 +4930,7 @@ bool ulonglong_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5922,52 +4947,43 @@ bool ulonglong_align_4_optionalPubSubType::deserialize( return true; } -std::function ulonglong_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t ulonglong_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ulonglong_align_4_optionalPubSubType::createData() +void* ulonglong_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new ulonglong_align_4_optional()); } -void ulonglong_align_4_optionalPubSubType::deleteData( +void ulonglong_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ulonglong_align_4_optionalPubSubType::getKey( +bool ulonglong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5975,35 +4991,27 @@ bool ulonglong_align_4_optionalPubSubType::getKey( const ulonglong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ulonglong_align_4_optional_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 || ulonglong_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6016,26 +5024,21 @@ void ulonglong_align_4_optionalPubSubType::register_type_object_representation() float_align_1_optionalPubSubType::float_align_1_optionalPubSubType() { - setName("float_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(float_align_1_optional::getMaxCdrSerializedSize()); -#else - float_align_1_optional_max_cdr_typesize; -#endif + set_name("float_align_1_optional"); + uint32_t type_size = float_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = float_align_1_optional_max_key_cdr_typesize > 16 ? float_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = float_align_1_optional_max_key_cdr_typesize > 16 ? float_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } float_align_1_optionalPubSubType::~float_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6053,12 +5056,10 @@ bool float_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6073,11 +5074,7 @@ bool float_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6094,11 +5091,7 @@ bool float_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6115,52 +5108,43 @@ bool float_align_1_optionalPubSubType::deserialize( return true; } -std::function float_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t float_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* float_align_1_optionalPubSubType::createData() +void* float_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new float_align_1_optional()); } -void float_align_1_optionalPubSubType::deleteData( +void float_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool float_align_1_optionalPubSubType::getKey( +bool float_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6168,35 +5152,27 @@ bool float_align_1_optionalPubSubType::getKey( const float_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), float_align_1_optional_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 || float_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6209,26 +5185,21 @@ void float_align_1_optionalPubSubType::register_type_object_representation() float_align_2_optionalPubSubType::float_align_2_optionalPubSubType() { - setName("float_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(float_align_2_optional::getMaxCdrSerializedSize()); -#else - float_align_2_optional_max_cdr_typesize; -#endif + set_name("float_align_2_optional"); + uint32_t type_size = float_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = float_align_2_optional_max_key_cdr_typesize > 16 ? float_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = float_align_2_optional_max_key_cdr_typesize > 16 ? float_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } float_align_2_optionalPubSubType::~float_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6246,12 +5217,10 @@ bool float_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6266,11 +5235,7 @@ bool float_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6287,11 +5252,7 @@ bool float_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6308,52 +5269,43 @@ bool float_align_2_optionalPubSubType::deserialize( return true; } -std::function float_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t float_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* float_align_2_optionalPubSubType::createData() +void* float_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new float_align_2_optional()); } -void float_align_2_optionalPubSubType::deleteData( +void float_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool float_align_2_optionalPubSubType::getKey( +bool float_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6361,35 +5313,27 @@ bool float_align_2_optionalPubSubType::getKey( const float_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), float_align_2_optional_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 || float_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6402,26 +5346,21 @@ void float_align_2_optionalPubSubType::register_type_object_representation() float_align_4_optionalPubSubType::float_align_4_optionalPubSubType() { - setName("float_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(float_align_4_optional::getMaxCdrSerializedSize()); -#else - float_align_4_optional_max_cdr_typesize; -#endif + set_name("float_align_4_optional"); + uint32_t type_size = float_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = float_align_4_optional_max_key_cdr_typesize > 16 ? float_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = float_align_4_optional_max_key_cdr_typesize > 16 ? float_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } float_align_4_optionalPubSubType::~float_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6439,12 +5378,10 @@ bool float_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6459,11 +5396,7 @@ bool float_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6480,11 +5413,7 @@ bool float_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6501,52 +5430,43 @@ bool float_align_4_optionalPubSubType::deserialize( return true; } -std::function float_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t float_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* float_align_4_optionalPubSubType::createData() +void* float_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new float_align_4_optional()); } -void float_align_4_optionalPubSubType::deleteData( +void float_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool float_align_4_optionalPubSubType::getKey( +bool float_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6554,35 +5474,27 @@ bool float_align_4_optionalPubSubType::getKey( const float_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), float_align_4_optional_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 || float_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6595,26 +5507,21 @@ void float_align_4_optionalPubSubType::register_type_object_representation() double_align_1_optionalPubSubType::double_align_1_optionalPubSubType() { - setName("double_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(double_align_1_optional::getMaxCdrSerializedSize()); -#else - double_align_1_optional_max_cdr_typesize; -#endif + set_name("double_align_1_optional"); + uint32_t type_size = double_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = double_align_1_optional_max_key_cdr_typesize > 16 ? double_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = double_align_1_optional_max_key_cdr_typesize > 16 ? double_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } double_align_1_optionalPubSubType::~double_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6632,12 +5539,10 @@ bool double_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6652,11 +5557,7 @@ bool double_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6673,11 +5574,7 @@ bool double_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6694,52 +5591,43 @@ bool double_align_1_optionalPubSubType::deserialize( return true; } -std::function double_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t double_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* double_align_1_optionalPubSubType::createData() +void* double_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new double_align_1_optional()); } -void double_align_1_optionalPubSubType::deleteData( +void double_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool double_align_1_optionalPubSubType::getKey( +bool double_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6747,35 +5635,27 @@ bool double_align_1_optionalPubSubType::getKey( const double_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), double_align_1_optional_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 || double_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6788,26 +5668,21 @@ void double_align_1_optionalPubSubType::register_type_object_representation() double_align_2_optionalPubSubType::double_align_2_optionalPubSubType() { - setName("double_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(double_align_2_optional::getMaxCdrSerializedSize()); -#else - double_align_2_optional_max_cdr_typesize; -#endif + set_name("double_align_2_optional"); + uint32_t type_size = double_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = double_align_2_optional_max_key_cdr_typesize > 16 ? double_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = double_align_2_optional_max_key_cdr_typesize > 16 ? double_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } double_align_2_optionalPubSubType::~double_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6825,12 +5700,10 @@ bool double_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6845,11 +5718,7 @@ bool double_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6866,11 +5735,7 @@ bool double_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6887,52 +5752,43 @@ bool double_align_2_optionalPubSubType::deserialize( return true; } -std::function double_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t double_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* double_align_2_optionalPubSubType::createData() +void* double_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new double_align_2_optional()); } -void double_align_2_optionalPubSubType::deleteData( +void double_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool double_align_2_optionalPubSubType::getKey( +bool double_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6940,35 +5796,27 @@ bool double_align_2_optionalPubSubType::getKey( const double_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), double_align_2_optional_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 || double_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6981,26 +5829,21 @@ void double_align_2_optionalPubSubType::register_type_object_representation() double_align_4_optionalPubSubType::double_align_4_optionalPubSubType() { - setName("double_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(double_align_4_optional::getMaxCdrSerializedSize()); -#else - double_align_4_optional_max_cdr_typesize; -#endif + set_name("double_align_4_optional"); + uint32_t type_size = double_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = double_align_4_optional_max_key_cdr_typesize > 16 ? double_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = double_align_4_optional_max_key_cdr_typesize > 16 ? double_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } double_align_4_optionalPubSubType::~double_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7018,12 +5861,10 @@ bool double_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7038,11 +5879,7 @@ bool double_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7059,11 +5896,7 @@ bool double_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7080,52 +5913,43 @@ bool double_align_4_optionalPubSubType::deserialize( return true; } -std::function double_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t double_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* double_align_4_optionalPubSubType::createData() +void* double_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new double_align_4_optional()); } -void double_align_4_optionalPubSubType::deleteData( +void double_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool double_align_4_optionalPubSubType::getKey( +bool double_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7133,35 +5957,27 @@ bool double_align_4_optionalPubSubType::getKey( const double_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), double_align_4_optional_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 || double_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7174,26 +5990,21 @@ void double_align_4_optionalPubSubType::register_type_object_representation() longdouble_align_1_optionalPubSubType::longdouble_align_1_optionalPubSubType() { - setName("longdouble_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longdouble_align_1_optional::getMaxCdrSerializedSize()); -#else - longdouble_align_1_optional_max_cdr_typesize; -#endif + set_name("longdouble_align_1_optional"); + uint32_t type_size = longdouble_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longdouble_align_1_optional_max_key_cdr_typesize > 16 ? longdouble_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longdouble_align_1_optional_max_key_cdr_typesize > 16 ? longdouble_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longdouble_align_1_optionalPubSubType::~longdouble_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7211,12 +6022,10 @@ bool longdouble_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7231,11 +6040,7 @@ bool longdouble_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7252,11 +6057,7 @@ bool longdouble_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7273,52 +6074,43 @@ bool longdouble_align_1_optionalPubSubType::deserialize( return true; } -std::function longdouble_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t longdouble_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longdouble_align_1_optionalPubSubType::createData() +void* longdouble_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new longdouble_align_1_optional()); } -void longdouble_align_1_optionalPubSubType::deleteData( +void longdouble_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longdouble_align_1_optionalPubSubType::getKey( +bool longdouble_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7326,35 +6118,27 @@ bool longdouble_align_1_optionalPubSubType::getKey( const longdouble_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longdouble_align_1_optional_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 || longdouble_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7367,26 +6151,21 @@ void longdouble_align_1_optionalPubSubType::register_type_object_representation( longdouble_align_2_optionalPubSubType::longdouble_align_2_optionalPubSubType() { - setName("longdouble_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longdouble_align_2_optional::getMaxCdrSerializedSize()); -#else - longdouble_align_2_optional_max_cdr_typesize; -#endif + set_name("longdouble_align_2_optional"); + uint32_t type_size = longdouble_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longdouble_align_2_optional_max_key_cdr_typesize > 16 ? longdouble_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longdouble_align_2_optional_max_key_cdr_typesize > 16 ? longdouble_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longdouble_align_2_optionalPubSubType::~longdouble_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7404,12 +6183,10 @@ bool longdouble_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7424,11 +6201,7 @@ bool longdouble_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7445,11 +6218,7 @@ bool longdouble_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7466,52 +6235,43 @@ bool longdouble_align_2_optionalPubSubType::deserialize( return true; } -std::function longdouble_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t longdouble_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longdouble_align_2_optionalPubSubType::createData() +void* longdouble_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new longdouble_align_2_optional()); } -void longdouble_align_2_optionalPubSubType::deleteData( +void longdouble_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longdouble_align_2_optionalPubSubType::getKey( +bool longdouble_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7519,35 +6279,27 @@ bool longdouble_align_2_optionalPubSubType::getKey( const longdouble_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longdouble_align_2_optional_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 || longdouble_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7560,26 +6312,21 @@ void longdouble_align_2_optionalPubSubType::register_type_object_representation( longdouble_align_4_optionalPubSubType::longdouble_align_4_optionalPubSubType() { - setName("longdouble_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(longdouble_align_4_optional::getMaxCdrSerializedSize()); -#else - longdouble_align_4_optional_max_cdr_typesize; -#endif + set_name("longdouble_align_4_optional"); + uint32_t type_size = longdouble_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = longdouble_align_4_optional_max_key_cdr_typesize > 16 ? longdouble_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = longdouble_align_4_optional_max_key_cdr_typesize > 16 ? longdouble_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } longdouble_align_4_optionalPubSubType::~longdouble_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7597,12 +6344,10 @@ bool longdouble_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7617,11 +6362,7 @@ bool longdouble_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7638,11 +6379,7 @@ bool longdouble_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7659,52 +6396,43 @@ bool longdouble_align_4_optionalPubSubType::deserialize( return true; } -std::function longdouble_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t longdouble_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* longdouble_align_4_optionalPubSubType::createData() +void* longdouble_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new longdouble_align_4_optional()); } -void longdouble_align_4_optionalPubSubType::deleteData( +void longdouble_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool longdouble_align_4_optionalPubSubType::getKey( +bool longdouble_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7712,35 +6440,27 @@ bool longdouble_align_4_optionalPubSubType::getKey( const longdouble_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), longdouble_align_4_optional_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 || longdouble_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7753,26 +6473,21 @@ void longdouble_align_4_optionalPubSubType::register_type_object_representation( boolean_align_1_optionalPubSubType::boolean_align_1_optionalPubSubType() { - setName("boolean_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(boolean_align_1_optional::getMaxCdrSerializedSize()); -#else - boolean_align_1_optional_max_cdr_typesize; -#endif + set_name("boolean_align_1_optional"); + uint32_t type_size = boolean_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = boolean_align_1_optional_max_key_cdr_typesize > 16 ? boolean_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = boolean_align_1_optional_max_key_cdr_typesize > 16 ? boolean_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } boolean_align_1_optionalPubSubType::~boolean_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7790,12 +6505,10 @@ bool boolean_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7810,11 +6523,7 @@ bool boolean_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7831,11 +6540,7 @@ bool boolean_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7852,52 +6557,43 @@ bool boolean_align_1_optionalPubSubType::deserialize( return true; } -std::function boolean_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t boolean_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* boolean_align_1_optionalPubSubType::createData() +void* boolean_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new boolean_align_1_optional()); } -void boolean_align_1_optionalPubSubType::deleteData( +void boolean_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool boolean_align_1_optionalPubSubType::getKey( +bool boolean_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7905,35 +6601,27 @@ bool boolean_align_1_optionalPubSubType::getKey( const boolean_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), boolean_align_1_optional_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 || boolean_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7946,26 +6634,21 @@ void boolean_align_1_optionalPubSubType::register_type_object_representation() boolean_align_2_optionalPubSubType::boolean_align_2_optionalPubSubType() { - setName("boolean_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(boolean_align_2_optional::getMaxCdrSerializedSize()); -#else - boolean_align_2_optional_max_cdr_typesize; -#endif + set_name("boolean_align_2_optional"); + uint32_t type_size = boolean_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = boolean_align_2_optional_max_key_cdr_typesize > 16 ? boolean_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = boolean_align_2_optional_max_key_cdr_typesize > 16 ? boolean_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } boolean_align_2_optionalPubSubType::~boolean_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7983,12 +6666,10 @@ bool boolean_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8003,11 +6684,7 @@ bool boolean_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8024,11 +6701,7 @@ bool boolean_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8045,52 +6718,43 @@ bool boolean_align_2_optionalPubSubType::deserialize( return true; } -std::function boolean_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t boolean_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* boolean_align_2_optionalPubSubType::createData() +void* boolean_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new boolean_align_2_optional()); } -void boolean_align_2_optionalPubSubType::deleteData( +void boolean_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool boolean_align_2_optionalPubSubType::getKey( +bool boolean_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8098,35 +6762,27 @@ bool boolean_align_2_optionalPubSubType::getKey( const boolean_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), boolean_align_2_optional_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 || boolean_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8139,26 +6795,21 @@ void boolean_align_2_optionalPubSubType::register_type_object_representation() boolean_align_4_optionalPubSubType::boolean_align_4_optionalPubSubType() { - setName("boolean_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(boolean_align_4_optional::getMaxCdrSerializedSize()); -#else - boolean_align_4_optional_max_cdr_typesize; -#endif + set_name("boolean_align_4_optional"); + uint32_t type_size = boolean_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = boolean_align_4_optional_max_key_cdr_typesize > 16 ? boolean_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = boolean_align_4_optional_max_key_cdr_typesize > 16 ? boolean_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } boolean_align_4_optionalPubSubType::~boolean_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8176,12 +6827,10 @@ bool boolean_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8196,11 +6845,7 @@ bool boolean_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8217,11 +6862,7 @@ bool boolean_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8238,52 +6879,43 @@ bool boolean_align_4_optionalPubSubType::deserialize( return true; } -std::function boolean_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t boolean_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* boolean_align_4_optionalPubSubType::createData() +void* boolean_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new boolean_align_4_optional()); } -void boolean_align_4_optionalPubSubType::deleteData( +void boolean_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool boolean_align_4_optionalPubSubType::getKey( +bool boolean_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8291,35 +6923,27 @@ bool boolean_align_4_optionalPubSubType::getKey( const boolean_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), boolean_align_4_optional_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 || boolean_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8332,26 +6956,21 @@ void boolean_align_4_optionalPubSubType::register_type_object_representation() octet_align_1_optionalPubSubType::octet_align_1_optionalPubSubType() { - setName("octet_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(octet_align_1_optional::getMaxCdrSerializedSize()); -#else - octet_align_1_optional_max_cdr_typesize; -#endif + set_name("octet_align_1_optional"); + uint32_t type_size = octet_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = octet_align_1_optional_max_key_cdr_typesize > 16 ? octet_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = octet_align_1_optional_max_key_cdr_typesize > 16 ? octet_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } octet_align_1_optionalPubSubType::~octet_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8369,12 +6988,10 @@ bool octet_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8389,11 +7006,7 @@ bool octet_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8410,11 +7023,7 @@ bool octet_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8431,52 +7040,43 @@ bool octet_align_1_optionalPubSubType::deserialize( return true; } -std::function octet_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t octet_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* octet_align_1_optionalPubSubType::createData() +void* octet_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new octet_align_1_optional()); } -void octet_align_1_optionalPubSubType::deleteData( +void octet_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool octet_align_1_optionalPubSubType::getKey( +bool octet_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8484,35 +7084,27 @@ bool octet_align_1_optionalPubSubType::getKey( const octet_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), octet_align_1_optional_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 || octet_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8525,26 +7117,21 @@ void octet_align_1_optionalPubSubType::register_type_object_representation() octet_align_2_optionalPubSubType::octet_align_2_optionalPubSubType() { - setName("octet_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(octet_align_2_optional::getMaxCdrSerializedSize()); -#else - octet_align_2_optional_max_cdr_typesize; -#endif + set_name("octet_align_2_optional"); + uint32_t type_size = octet_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = octet_align_2_optional_max_key_cdr_typesize > 16 ? octet_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = octet_align_2_optional_max_key_cdr_typesize > 16 ? octet_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } octet_align_2_optionalPubSubType::~octet_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8562,12 +7149,10 @@ bool octet_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8582,11 +7167,7 @@ bool octet_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8603,11 +7184,7 @@ bool octet_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8624,52 +7201,43 @@ bool octet_align_2_optionalPubSubType::deserialize( return true; } -std::function octet_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t octet_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* octet_align_2_optionalPubSubType::createData() +void* octet_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new octet_align_2_optional()); } -void octet_align_2_optionalPubSubType::deleteData( +void octet_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool octet_align_2_optionalPubSubType::getKey( +bool octet_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8677,35 +7245,27 @@ bool octet_align_2_optionalPubSubType::getKey( const octet_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), octet_align_2_optional_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 || octet_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8718,26 +7278,21 @@ void octet_align_2_optionalPubSubType::register_type_object_representation() octet_align_4_optionalPubSubType::octet_align_4_optionalPubSubType() { - setName("octet_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(octet_align_4_optional::getMaxCdrSerializedSize()); -#else - octet_align_4_optional_max_cdr_typesize; -#endif + set_name("octet_align_4_optional"); + uint32_t type_size = octet_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = octet_align_4_optional_max_key_cdr_typesize > 16 ? octet_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = octet_align_4_optional_max_key_cdr_typesize > 16 ? octet_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } octet_align_4_optionalPubSubType::~octet_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8755,12 +7310,10 @@ bool octet_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8775,11 +7328,7 @@ bool octet_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8796,11 +7345,7 @@ bool octet_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -8817,52 +7362,43 @@ bool octet_align_4_optionalPubSubType::deserialize( return true; } -std::function octet_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t octet_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* octet_align_4_optionalPubSubType::createData() +void* octet_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new octet_align_4_optional()); } -void octet_align_4_optionalPubSubType::deleteData( +void octet_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool octet_align_4_optionalPubSubType::getKey( +bool octet_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -8870,35 +7406,27 @@ bool octet_align_4_optionalPubSubType::getKey( const octet_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), octet_align_4_optional_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 || octet_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -8911,26 +7439,21 @@ void octet_align_4_optionalPubSubType::register_type_object_representation() char_align_1_optionalPubSubType::char_align_1_optionalPubSubType() { - setName("char_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(char_align_1_optional::getMaxCdrSerializedSize()); -#else - char_align_1_optional_max_cdr_typesize; -#endif + set_name("char_align_1_optional"); + uint32_t type_size = char_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = char_align_1_optional_max_key_cdr_typesize > 16 ? char_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = char_align_1_optional_max_key_cdr_typesize > 16 ? char_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } char_align_1_optionalPubSubType::~char_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -8948,12 +7471,10 @@ bool char_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -8968,11 +7489,7 @@ bool char_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -8989,11 +7506,7 @@ bool char_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9010,52 +7523,43 @@ bool char_align_1_optionalPubSubType::deserialize( return true; } -std::function char_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t char_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* char_align_1_optionalPubSubType::createData() +void* char_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new char_align_1_optional()); } -void char_align_1_optionalPubSubType::deleteData( +void char_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool char_align_1_optionalPubSubType::getKey( +bool char_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9063,35 +7567,27 @@ bool char_align_1_optionalPubSubType::getKey( const char_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), char_align_1_optional_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 || char_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9104,26 +7600,21 @@ void char_align_1_optionalPubSubType::register_type_object_representation() char_align_2_optionalPubSubType::char_align_2_optionalPubSubType() { - setName("char_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(char_align_2_optional::getMaxCdrSerializedSize()); -#else - char_align_2_optional_max_cdr_typesize; -#endif + set_name("char_align_2_optional"); + uint32_t type_size = char_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = char_align_2_optional_max_key_cdr_typesize > 16 ? char_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = char_align_2_optional_max_key_cdr_typesize > 16 ? char_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } char_align_2_optionalPubSubType::~char_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9141,12 +7632,10 @@ bool char_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9161,11 +7650,7 @@ bool char_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9182,11 +7667,7 @@ bool char_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9203,52 +7684,43 @@ bool char_align_2_optionalPubSubType::deserialize( return true; } -std::function char_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t char_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* char_align_2_optionalPubSubType::createData() +void* char_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new char_align_2_optional()); } -void char_align_2_optionalPubSubType::deleteData( +void char_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool char_align_2_optionalPubSubType::getKey( +bool char_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9256,35 +7728,27 @@ bool char_align_2_optionalPubSubType::getKey( const char_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), char_align_2_optional_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 || char_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9297,26 +7761,21 @@ void char_align_2_optionalPubSubType::register_type_object_representation() char_align_4_optionalPubSubType::char_align_4_optionalPubSubType() { - setName("char_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(char_align_4_optional::getMaxCdrSerializedSize()); -#else - char_align_4_optional_max_cdr_typesize; -#endif + set_name("char_align_4_optional"); + uint32_t type_size = char_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = char_align_4_optional_max_key_cdr_typesize > 16 ? char_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = char_align_4_optional_max_key_cdr_typesize > 16 ? char_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } char_align_4_optionalPubSubType::~char_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9334,12 +7793,10 @@ bool char_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9354,11 +7811,7 @@ bool char_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9375,11 +7828,7 @@ bool char_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9396,52 +7845,43 @@ bool char_align_4_optionalPubSubType::deserialize( return true; } -std::function char_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t char_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* char_align_4_optionalPubSubType::createData() +void* char_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new char_align_4_optional()); } -void char_align_4_optionalPubSubType::deleteData( +void char_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool char_align_4_optionalPubSubType::getKey( +bool char_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9449,35 +7889,27 @@ bool char_align_4_optionalPubSubType::getKey( const char_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), char_align_4_optional_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 || char_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9490,26 +7922,21 @@ void char_align_4_optionalPubSubType::register_type_object_representation() wchar_align_1_optionalPubSubType::wchar_align_1_optionalPubSubType() { - setName("wchar_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(wchar_align_1_optional::getMaxCdrSerializedSize()); -#else - wchar_align_1_optional_max_cdr_typesize; -#endif + set_name("wchar_align_1_optional"); + uint32_t type_size = wchar_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = wchar_align_1_optional_max_key_cdr_typesize > 16 ? wchar_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = wchar_align_1_optional_max_key_cdr_typesize > 16 ? wchar_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } wchar_align_1_optionalPubSubType::~wchar_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9527,12 +7954,10 @@ bool wchar_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9547,11 +7972,7 @@ bool wchar_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9568,11 +7989,7 @@ bool wchar_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9589,52 +8006,43 @@ bool wchar_align_1_optionalPubSubType::deserialize( return true; } -std::function wchar_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t wchar_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* wchar_align_1_optionalPubSubType::createData() +void* wchar_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new wchar_align_1_optional()); } -void wchar_align_1_optionalPubSubType::deleteData( +void wchar_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool wchar_align_1_optionalPubSubType::getKey( +bool wchar_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9642,35 +8050,27 @@ bool wchar_align_1_optionalPubSubType::getKey( const wchar_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), wchar_align_1_optional_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 || wchar_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9683,26 +8083,21 @@ void wchar_align_1_optionalPubSubType::register_type_object_representation() wchar_align_2_optionalPubSubType::wchar_align_2_optionalPubSubType() { - setName("wchar_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(wchar_align_2_optional::getMaxCdrSerializedSize()); -#else - wchar_align_2_optional_max_cdr_typesize; -#endif + set_name("wchar_align_2_optional"); + uint32_t type_size = wchar_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = wchar_align_2_optional_max_key_cdr_typesize > 16 ? wchar_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = wchar_align_2_optional_max_key_cdr_typesize > 16 ? wchar_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } wchar_align_2_optionalPubSubType::~wchar_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9720,12 +8115,10 @@ bool wchar_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9740,11 +8133,7 @@ bool wchar_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9761,11 +8150,7 @@ bool wchar_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9782,52 +8167,43 @@ bool wchar_align_2_optionalPubSubType::deserialize( return true; } -std::function wchar_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t wchar_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* wchar_align_2_optionalPubSubType::createData() +void* wchar_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new wchar_align_2_optional()); } -void wchar_align_2_optionalPubSubType::deleteData( +void wchar_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool wchar_align_2_optionalPubSubType::getKey( +bool wchar_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -9835,35 +8211,27 @@ bool wchar_align_2_optionalPubSubType::getKey( const wchar_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), wchar_align_2_optional_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 || wchar_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -9876,26 +8244,21 @@ void wchar_align_2_optionalPubSubType::register_type_object_representation() wchar_align_4_optionalPubSubType::wchar_align_4_optionalPubSubType() { - setName("wchar_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(wchar_align_4_optional::getMaxCdrSerializedSize()); -#else - wchar_align_4_optional_max_cdr_typesize; -#endif + set_name("wchar_align_4_optional"); + uint32_t type_size = wchar_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = wchar_align_4_optional_max_key_cdr_typesize > 16 ? wchar_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = wchar_align_4_optional_max_key_cdr_typesize > 16 ? wchar_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } wchar_align_4_optionalPubSubType::~wchar_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -9913,12 +8276,10 @@ bool wchar_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -9933,11 +8294,7 @@ bool wchar_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -9954,11 +8311,7 @@ bool wchar_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -9975,52 +8328,43 @@ bool wchar_align_4_optionalPubSubType::deserialize( return true; } -std::function wchar_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t wchar_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* wchar_align_4_optionalPubSubType::createData() +void* wchar_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new wchar_align_4_optional()); } -void wchar_align_4_optionalPubSubType::deleteData( +void wchar_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool wchar_align_4_optionalPubSubType::getKey( +bool wchar_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10028,35 +8372,27 @@ bool wchar_align_4_optionalPubSubType::getKey( const wchar_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), wchar_align_4_optional_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 || wchar_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10069,26 +8405,21 @@ void wchar_align_4_optionalPubSubType::register_type_object_representation() sequence_short_optionalPubSubType::sequence_short_optionalPubSubType() { - setName("sequence_short_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sequence_short_optional::getMaxCdrSerializedSize()); -#else - sequence_short_optional_max_cdr_typesize; -#endif + set_name("sequence_short_optional"); + uint32_t type_size = sequence_short_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = sequence_short_optional_max_key_cdr_typesize > 16 ? sequence_short_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = sequence_short_optional_max_key_cdr_typesize > 16 ? sequence_short_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } sequence_short_optionalPubSubType::~sequence_short_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10106,12 +8437,10 @@ bool sequence_short_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10126,11 +8455,7 @@ bool sequence_short_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10147,11 +8472,7 @@ bool sequence_short_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10168,52 +8489,43 @@ bool sequence_short_optionalPubSubType::deserialize( return true; } -std::function sequence_short_optionalPubSubType::getSerializedSizeProvider( +uint32_t sequence_short_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* sequence_short_optionalPubSubType::createData() +void* sequence_short_optionalPubSubType::create_data() { return reinterpret_cast(new sequence_short_optional()); } -void sequence_short_optionalPubSubType::deleteData( +void sequence_short_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool sequence_short_optionalPubSubType::getKey( +bool sequence_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10221,35 +8533,27 @@ bool sequence_short_optionalPubSubType::getKey( const sequence_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sequence_short_optional_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 || sequence_short_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10262,26 +8566,21 @@ void sequence_short_optionalPubSubType::register_type_object_representation() sequence_short_align_1_optionalPubSubType::sequence_short_align_1_optionalPubSubType() { - setName("sequence_short_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sequence_short_align_1_optional::getMaxCdrSerializedSize()); -#else - sequence_short_align_1_optional_max_cdr_typesize; -#endif + set_name("sequence_short_align_1_optional"); + uint32_t type_size = sequence_short_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = sequence_short_align_1_optional_max_key_cdr_typesize > 16 ? sequence_short_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = sequence_short_align_1_optional_max_key_cdr_typesize > 16 ? sequence_short_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } sequence_short_align_1_optionalPubSubType::~sequence_short_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10299,12 +8598,10 @@ bool sequence_short_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10319,11 +8616,7 @@ bool sequence_short_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10340,11 +8633,7 @@ bool sequence_short_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10361,52 +8650,43 @@ bool sequence_short_align_1_optionalPubSubType::deserialize( return true; } -std::function sequence_short_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t sequence_short_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* sequence_short_align_1_optionalPubSubType::createData() +void* sequence_short_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new sequence_short_align_1_optional()); } -void sequence_short_align_1_optionalPubSubType::deleteData( +void sequence_short_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool sequence_short_align_1_optionalPubSubType::getKey( +bool sequence_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10414,35 +8694,27 @@ bool sequence_short_align_1_optionalPubSubType::getKey( const sequence_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sequence_short_align_1_optional_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 || sequence_short_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10455,26 +8727,21 @@ void sequence_short_align_1_optionalPubSubType::register_type_object_representat sequence_short_align_2_optionalPubSubType::sequence_short_align_2_optionalPubSubType() { - setName("sequence_short_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sequence_short_align_2_optional::getMaxCdrSerializedSize()); -#else - sequence_short_align_2_optional_max_cdr_typesize; -#endif + set_name("sequence_short_align_2_optional"); + uint32_t type_size = sequence_short_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = sequence_short_align_2_optional_max_key_cdr_typesize > 16 ? sequence_short_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = sequence_short_align_2_optional_max_key_cdr_typesize > 16 ? sequence_short_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } sequence_short_align_2_optionalPubSubType::~sequence_short_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10492,12 +8759,10 @@ bool sequence_short_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10512,11 +8777,7 @@ bool sequence_short_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10533,11 +8794,7 @@ bool sequence_short_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10554,52 +8811,43 @@ bool sequence_short_align_2_optionalPubSubType::deserialize( return true; } -std::function sequence_short_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t sequence_short_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* sequence_short_align_2_optionalPubSubType::createData() +void* sequence_short_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new sequence_short_align_2_optional()); } -void sequence_short_align_2_optionalPubSubType::deleteData( +void sequence_short_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool sequence_short_align_2_optionalPubSubType::getKey( +bool sequence_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10607,35 +8855,27 @@ bool sequence_short_align_2_optionalPubSubType::getKey( const sequence_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sequence_short_align_2_optional_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 || sequence_short_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10648,26 +8888,21 @@ void sequence_short_align_2_optionalPubSubType::register_type_object_representat sequence_short_align_4_optionalPubSubType::sequence_short_align_4_optionalPubSubType() { - setName("sequence_short_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(sequence_short_align_4_optional::getMaxCdrSerializedSize()); -#else - sequence_short_align_4_optional_max_cdr_typesize; -#endif + set_name("sequence_short_align_4_optional"); + uint32_t type_size = sequence_short_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = sequence_short_align_4_optional_max_key_cdr_typesize > 16 ? sequence_short_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = sequence_short_align_4_optional_max_key_cdr_typesize > 16 ? sequence_short_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } sequence_short_align_4_optionalPubSubType::~sequence_short_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10685,12 +8920,10 @@ bool sequence_short_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10705,11 +8938,7 @@ bool sequence_short_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10726,11 +8955,7 @@ bool sequence_short_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10747,52 +8972,43 @@ bool sequence_short_align_4_optionalPubSubType::deserialize( return true; } -std::function sequence_short_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t sequence_short_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* sequence_short_align_4_optionalPubSubType::createData() +void* sequence_short_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new sequence_short_align_4_optional()); } -void sequence_short_align_4_optionalPubSubType::deleteData( +void sequence_short_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool sequence_short_align_4_optionalPubSubType::getKey( +bool sequence_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10800,35 +9016,27 @@ bool sequence_short_align_4_optionalPubSubType::getKey( const sequence_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), sequence_short_align_4_optional_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 || sequence_short_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -10841,26 +9049,21 @@ void sequence_short_align_4_optionalPubSubType::register_type_object_representat string_unbounded_optionalPubSubType::string_unbounded_optionalPubSubType() { - setName("string_unbounded_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_unbounded_optional::getMaxCdrSerializedSize()); -#else - string_unbounded_optional_max_cdr_typesize; -#endif + set_name("string_unbounded_optional"); + uint32_t type_size = string_unbounded_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_unbounded_optional_max_key_cdr_typesize > 16 ? string_unbounded_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_unbounded_optional_max_key_cdr_typesize > 16 ? string_unbounded_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_unbounded_optionalPubSubType::~string_unbounded_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -10878,12 +9081,10 @@ bool string_unbounded_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -10898,11 +9099,7 @@ bool string_unbounded_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -10919,11 +9116,7 @@ bool string_unbounded_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -10940,52 +9133,43 @@ bool string_unbounded_optionalPubSubType::deserialize( return true; } -std::function string_unbounded_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_unbounded_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_unbounded_optionalPubSubType::createData() +void* string_unbounded_optionalPubSubType::create_data() { return reinterpret_cast(new string_unbounded_optional()); } -void string_unbounded_optionalPubSubType::deleteData( +void string_unbounded_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_unbounded_optionalPubSubType::getKey( +bool string_unbounded_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -10993,35 +9177,27 @@ bool string_unbounded_optionalPubSubType::getKey( const string_unbounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_unbounded_optional_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 || string_unbounded_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11034,26 +9210,21 @@ void string_unbounded_optionalPubSubType::register_type_object_representation() string_unbounded_align_1_optionalPubSubType::string_unbounded_align_1_optionalPubSubType() { - setName("string_unbounded_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_unbounded_align_1_optional::getMaxCdrSerializedSize()); -#else - string_unbounded_align_1_optional_max_cdr_typesize; -#endif + set_name("string_unbounded_align_1_optional"); + uint32_t type_size = string_unbounded_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_unbounded_align_1_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_unbounded_align_1_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_unbounded_align_1_optionalPubSubType::~string_unbounded_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11071,12 +9242,10 @@ bool string_unbounded_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11091,11 +9260,7 @@ bool string_unbounded_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11112,11 +9277,7 @@ bool string_unbounded_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11133,52 +9294,43 @@ bool string_unbounded_align_1_optionalPubSubType::deserialize( return true; } -std::function string_unbounded_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_unbounded_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_unbounded_align_1_optionalPubSubType::createData() +void* string_unbounded_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new string_unbounded_align_1_optional()); } -void string_unbounded_align_1_optionalPubSubType::deleteData( +void string_unbounded_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_unbounded_align_1_optionalPubSubType::getKey( +bool string_unbounded_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11186,35 +9338,27 @@ bool string_unbounded_align_1_optionalPubSubType::getKey( const string_unbounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_unbounded_align_1_optional_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 || string_unbounded_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11227,26 +9371,21 @@ void string_unbounded_align_1_optionalPubSubType::register_type_object_represent string_unbounded_align_2_optionalPubSubType::string_unbounded_align_2_optionalPubSubType() { - setName("string_unbounded_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_unbounded_align_2_optional::getMaxCdrSerializedSize()); -#else - string_unbounded_align_2_optional_max_cdr_typesize; -#endif + set_name("string_unbounded_align_2_optional"); + uint32_t type_size = string_unbounded_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_unbounded_align_2_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_unbounded_align_2_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_unbounded_align_2_optionalPubSubType::~string_unbounded_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11264,12 +9403,10 @@ bool string_unbounded_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11284,11 +9421,7 @@ bool string_unbounded_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11305,11 +9438,7 @@ bool string_unbounded_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11326,52 +9455,43 @@ bool string_unbounded_align_2_optionalPubSubType::deserialize( return true; } -std::function string_unbounded_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_unbounded_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_unbounded_align_2_optionalPubSubType::createData() +void* string_unbounded_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new string_unbounded_align_2_optional()); } -void string_unbounded_align_2_optionalPubSubType::deleteData( +void string_unbounded_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_unbounded_align_2_optionalPubSubType::getKey( +bool string_unbounded_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11379,35 +9499,27 @@ bool string_unbounded_align_2_optionalPubSubType::getKey( const string_unbounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_unbounded_align_2_optional_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 || string_unbounded_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11420,26 +9532,21 @@ void string_unbounded_align_2_optionalPubSubType::register_type_object_represent string_unbounded_align_4_optionalPubSubType::string_unbounded_align_4_optionalPubSubType() { - setName("string_unbounded_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_unbounded_align_4_optional::getMaxCdrSerializedSize()); -#else - string_unbounded_align_4_optional_max_cdr_typesize; -#endif + set_name("string_unbounded_align_4_optional"); + uint32_t type_size = string_unbounded_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_unbounded_align_4_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_unbounded_align_4_optional_max_key_cdr_typesize > 16 ? string_unbounded_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_unbounded_align_4_optionalPubSubType::~string_unbounded_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11457,12 +9564,10 @@ bool string_unbounded_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11477,11 +9582,7 @@ bool string_unbounded_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11498,11 +9599,7 @@ bool string_unbounded_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11519,52 +9616,43 @@ bool string_unbounded_align_4_optionalPubSubType::deserialize( return true; } -std::function string_unbounded_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_unbounded_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_unbounded_align_4_optionalPubSubType::createData() +void* string_unbounded_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new string_unbounded_align_4_optional()); } -void string_unbounded_align_4_optionalPubSubType::deleteData( +void string_unbounded_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_unbounded_align_4_optionalPubSubType::getKey( +bool string_unbounded_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11572,35 +9660,27 @@ bool string_unbounded_align_4_optionalPubSubType::getKey( const string_unbounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_unbounded_align_4_optional_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 || string_unbounded_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11613,26 +9693,21 @@ void string_unbounded_align_4_optionalPubSubType::register_type_object_represent string_bounded_optionalPubSubType::string_bounded_optionalPubSubType() { - setName("string_bounded_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_bounded_optional::getMaxCdrSerializedSize()); -#else - string_bounded_optional_max_cdr_typesize; -#endif + set_name("string_bounded_optional"); + uint32_t type_size = string_bounded_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_bounded_optional_max_key_cdr_typesize > 16 ? string_bounded_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_bounded_optional_max_key_cdr_typesize > 16 ? string_bounded_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_bounded_optionalPubSubType::~string_bounded_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11650,12 +9725,10 @@ bool string_bounded_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11670,11 +9743,7 @@ bool string_bounded_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11691,11 +9760,7 @@ bool string_bounded_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11712,52 +9777,43 @@ bool string_bounded_optionalPubSubType::deserialize( return true; } -std::function string_bounded_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_bounded_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_bounded_optionalPubSubType::createData() +void* string_bounded_optionalPubSubType::create_data() { return reinterpret_cast(new string_bounded_optional()); } -void string_bounded_optionalPubSubType::deleteData( +void string_bounded_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_bounded_optionalPubSubType::getKey( +bool string_bounded_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11765,35 +9821,27 @@ bool string_bounded_optionalPubSubType::getKey( const string_bounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_bounded_optional_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 || string_bounded_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11806,26 +9854,21 @@ void string_bounded_optionalPubSubType::register_type_object_representation() string_bounded_align_1_optionalPubSubType::string_bounded_align_1_optionalPubSubType() { - setName("string_bounded_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_bounded_align_1_optional::getMaxCdrSerializedSize()); -#else - string_bounded_align_1_optional_max_cdr_typesize; -#endif + set_name("string_bounded_align_1_optional"); + uint32_t type_size = string_bounded_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_bounded_align_1_optional_max_key_cdr_typesize > 16 ? string_bounded_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_bounded_align_1_optional_max_key_cdr_typesize > 16 ? string_bounded_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_bounded_align_1_optionalPubSubType::~string_bounded_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -11843,12 +9886,10 @@ bool string_bounded_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -11863,11 +9904,7 @@ bool string_bounded_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -11884,11 +9921,7 @@ bool string_bounded_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -11905,52 +9938,43 @@ bool string_bounded_align_1_optionalPubSubType::deserialize( return true; } -std::function string_bounded_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_bounded_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_bounded_align_1_optionalPubSubType::createData() +void* string_bounded_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new string_bounded_align_1_optional()); } -void string_bounded_align_1_optionalPubSubType::deleteData( +void string_bounded_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_bounded_align_1_optionalPubSubType::getKey( +bool string_bounded_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -11958,35 +9982,27 @@ bool string_bounded_align_1_optionalPubSubType::getKey( const string_bounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_bounded_align_1_optional_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 || string_bounded_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -11999,26 +10015,21 @@ void string_bounded_align_1_optionalPubSubType::register_type_object_representat string_bounded_align_2_optionalPubSubType::string_bounded_align_2_optionalPubSubType() { - setName("string_bounded_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_bounded_align_2_optional::getMaxCdrSerializedSize()); -#else - string_bounded_align_2_optional_max_cdr_typesize; -#endif + set_name("string_bounded_align_2_optional"); + uint32_t type_size = string_bounded_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_bounded_align_2_optional_max_key_cdr_typesize > 16 ? string_bounded_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_bounded_align_2_optional_max_key_cdr_typesize > 16 ? string_bounded_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_bounded_align_2_optionalPubSubType::~string_bounded_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12036,12 +10047,10 @@ bool string_bounded_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12056,11 +10065,7 @@ bool string_bounded_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12077,11 +10082,7 @@ bool string_bounded_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12098,52 +10099,43 @@ bool string_bounded_align_2_optionalPubSubType::deserialize( return true; } -std::function string_bounded_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_bounded_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_bounded_align_2_optionalPubSubType::createData() +void* string_bounded_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new string_bounded_align_2_optional()); } -void string_bounded_align_2_optionalPubSubType::deleteData( +void string_bounded_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_bounded_align_2_optionalPubSubType::getKey( +bool string_bounded_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12151,35 +10143,27 @@ bool string_bounded_align_2_optionalPubSubType::getKey( const string_bounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_bounded_align_2_optional_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 || string_bounded_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12192,26 +10176,21 @@ void string_bounded_align_2_optionalPubSubType::register_type_object_representat string_bounded_align_4_optionalPubSubType::string_bounded_align_4_optionalPubSubType() { - setName("string_bounded_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(string_bounded_align_4_optional::getMaxCdrSerializedSize()); -#else - string_bounded_align_4_optional_max_cdr_typesize; -#endif + set_name("string_bounded_align_4_optional"); + uint32_t type_size = string_bounded_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = string_bounded_align_4_optional_max_key_cdr_typesize > 16 ? string_bounded_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = string_bounded_align_4_optional_max_key_cdr_typesize > 16 ? string_bounded_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } string_bounded_align_4_optionalPubSubType::~string_bounded_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12229,12 +10208,10 @@ bool string_bounded_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12249,11 +10226,7 @@ bool string_bounded_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12270,11 +10243,7 @@ bool string_bounded_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12291,52 +10260,43 @@ bool string_bounded_align_4_optionalPubSubType::deserialize( return true; } -std::function string_bounded_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t string_bounded_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* string_bounded_align_4_optionalPubSubType::createData() +void* string_bounded_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new string_bounded_align_4_optional()); } -void string_bounded_align_4_optionalPubSubType::deleteData( +void string_bounded_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool string_bounded_align_4_optionalPubSubType::getKey( +bool string_bounded_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12344,35 +10304,27 @@ bool string_bounded_align_4_optionalPubSubType::getKey( const string_bounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), string_bounded_align_4_optional_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 || string_bounded_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12385,26 +10337,21 @@ void string_bounded_align_4_optionalPubSubType::register_type_object_representat map_short_optionalPubSubType::map_short_optionalPubSubType() { - setName("map_short_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(map_short_optional::getMaxCdrSerializedSize()); -#else - map_short_optional_max_cdr_typesize; -#endif + set_name("map_short_optional"); + uint32_t type_size = map_short_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = map_short_optional_max_key_cdr_typesize > 16 ? map_short_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = map_short_optional_max_key_cdr_typesize > 16 ? map_short_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } map_short_optionalPubSubType::~map_short_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12422,12 +10369,10 @@ bool map_short_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12442,11 +10387,7 @@ bool map_short_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12463,11 +10404,7 @@ bool map_short_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12484,52 +10421,43 @@ bool map_short_optionalPubSubType::deserialize( return true; } -std::function map_short_optionalPubSubType::getSerializedSizeProvider( +uint32_t map_short_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* map_short_optionalPubSubType::createData() +void* map_short_optionalPubSubType::create_data() { return reinterpret_cast(new map_short_optional()); } -void map_short_optionalPubSubType::deleteData( +void map_short_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool map_short_optionalPubSubType::getKey( +bool map_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12537,35 +10465,27 @@ bool map_short_optionalPubSubType::getKey( const map_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), map_short_optional_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 || map_short_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12578,26 +10498,21 @@ void map_short_optionalPubSubType::register_type_object_representation() map_short_align_1_optionalPubSubType::map_short_align_1_optionalPubSubType() { - setName("map_short_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(map_short_align_1_optional::getMaxCdrSerializedSize()); -#else - map_short_align_1_optional_max_cdr_typesize; -#endif + set_name("map_short_align_1_optional"); + uint32_t type_size = map_short_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = map_short_align_1_optional_max_key_cdr_typesize > 16 ? map_short_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = map_short_align_1_optional_max_key_cdr_typesize > 16 ? map_short_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } map_short_align_1_optionalPubSubType::~map_short_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12615,12 +10530,10 @@ bool map_short_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12635,11 +10548,7 @@ bool map_short_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12656,11 +10565,7 @@ bool map_short_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12677,52 +10582,43 @@ bool map_short_align_1_optionalPubSubType::deserialize( return true; } -std::function map_short_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t map_short_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* map_short_align_1_optionalPubSubType::createData() +void* map_short_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new map_short_align_1_optional()); } -void map_short_align_1_optionalPubSubType::deleteData( +void map_short_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool map_short_align_1_optionalPubSubType::getKey( +bool map_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12730,35 +10626,27 @@ bool map_short_align_1_optionalPubSubType::getKey( const map_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), map_short_align_1_optional_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 || map_short_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12771,26 +10659,21 @@ void map_short_align_1_optionalPubSubType::register_type_object_representation() map_short_align_2_optionalPubSubType::map_short_align_2_optionalPubSubType() { - setName("map_short_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(map_short_align_2_optional::getMaxCdrSerializedSize()); -#else - map_short_align_2_optional_max_cdr_typesize; -#endif + set_name("map_short_align_2_optional"); + uint32_t type_size = map_short_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = map_short_align_2_optional_max_key_cdr_typesize > 16 ? map_short_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = map_short_align_2_optional_max_key_cdr_typesize > 16 ? map_short_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } map_short_align_2_optionalPubSubType::~map_short_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -12808,12 +10691,10 @@ bool map_short_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -12828,11 +10709,7 @@ bool map_short_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -12849,11 +10726,7 @@ bool map_short_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -12870,52 +10743,43 @@ bool map_short_align_2_optionalPubSubType::deserialize( return true; } -std::function map_short_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t map_short_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* map_short_align_2_optionalPubSubType::createData() +void* map_short_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new map_short_align_2_optional()); } -void map_short_align_2_optionalPubSubType::deleteData( +void map_short_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool map_short_align_2_optionalPubSubType::getKey( +bool map_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -12923,35 +10787,27 @@ bool map_short_align_2_optionalPubSubType::getKey( const map_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), map_short_align_2_optional_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 || map_short_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -12964,26 +10820,21 @@ void map_short_align_2_optionalPubSubType::register_type_object_representation() map_short_align_4_optionalPubSubType::map_short_align_4_optionalPubSubType() { - setName("map_short_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(map_short_align_4_optional::getMaxCdrSerializedSize()); -#else - map_short_align_4_optional_max_cdr_typesize; -#endif + set_name("map_short_align_4_optional"); + uint32_t type_size = map_short_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = map_short_align_4_optional_max_key_cdr_typesize > 16 ? map_short_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = map_short_align_4_optional_max_key_cdr_typesize > 16 ? map_short_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } map_short_align_4_optionalPubSubType::~map_short_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13001,12 +10852,10 @@ bool map_short_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13021,11 +10870,7 @@ bool map_short_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13042,11 +10887,7 @@ bool map_short_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13063,52 +10904,43 @@ bool map_short_align_4_optionalPubSubType::deserialize( return true; } -std::function map_short_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t map_short_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* map_short_align_4_optionalPubSubType::createData() +void* map_short_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new map_short_align_4_optional()); } -void map_short_align_4_optionalPubSubType::deleteData( +void map_short_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool map_short_align_4_optionalPubSubType::getKey( +bool map_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13116,35 +10948,27 @@ bool map_short_align_4_optionalPubSubType::getKey( const map_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), map_short_align_4_optional_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 || map_short_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13157,26 +10981,21 @@ void map_short_align_4_optionalPubSubType::register_type_object_representation() array_short_optionalPubSubType::array_short_optionalPubSubType() { - setName("array_short_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(array_short_optional::getMaxCdrSerializedSize()); -#else - array_short_optional_max_cdr_typesize; -#endif + set_name("array_short_optional"); + uint32_t type_size = array_short_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = array_short_optional_max_key_cdr_typesize > 16 ? array_short_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = array_short_optional_max_key_cdr_typesize > 16 ? array_short_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } array_short_optionalPubSubType::~array_short_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13194,12 +11013,10 @@ bool array_short_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13214,11 +11031,7 @@ bool array_short_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13235,11 +11048,7 @@ bool array_short_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13256,52 +11065,43 @@ bool array_short_optionalPubSubType::deserialize( return true; } -std::function array_short_optionalPubSubType::getSerializedSizeProvider( +uint32_t array_short_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* array_short_optionalPubSubType::createData() +void* array_short_optionalPubSubType::create_data() { return reinterpret_cast(new array_short_optional()); } -void array_short_optionalPubSubType::deleteData( +void array_short_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool array_short_optionalPubSubType::getKey( +bool array_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13309,35 +11109,27 @@ bool array_short_optionalPubSubType::getKey( const array_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), array_short_optional_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 || array_short_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13350,26 +11142,21 @@ void array_short_optionalPubSubType::register_type_object_representation() array_short_align_1_optionalPubSubType::array_short_align_1_optionalPubSubType() { - setName("array_short_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(array_short_align_1_optional::getMaxCdrSerializedSize()); -#else - array_short_align_1_optional_max_cdr_typesize; -#endif + set_name("array_short_align_1_optional"); + uint32_t type_size = array_short_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = array_short_align_1_optional_max_key_cdr_typesize > 16 ? array_short_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = array_short_align_1_optional_max_key_cdr_typesize > 16 ? array_short_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } array_short_align_1_optionalPubSubType::~array_short_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13387,12 +11174,10 @@ bool array_short_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13407,11 +11192,7 @@ bool array_short_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13428,11 +11209,7 @@ bool array_short_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13449,52 +11226,43 @@ bool array_short_align_1_optionalPubSubType::deserialize( return true; } -std::function array_short_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t array_short_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* array_short_align_1_optionalPubSubType::createData() +void* array_short_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new array_short_align_1_optional()); } -void array_short_align_1_optionalPubSubType::deleteData( +void array_short_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool array_short_align_1_optionalPubSubType::getKey( +bool array_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13502,35 +11270,27 @@ bool array_short_align_1_optionalPubSubType::getKey( const array_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), array_short_align_1_optional_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 || array_short_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13543,26 +11303,21 @@ void array_short_align_1_optionalPubSubType::register_type_object_representation array_short_align_2_optionalPubSubType::array_short_align_2_optionalPubSubType() { - setName("array_short_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(array_short_align_2_optional::getMaxCdrSerializedSize()); -#else - array_short_align_2_optional_max_cdr_typesize; -#endif + set_name("array_short_align_2_optional"); + uint32_t type_size = array_short_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = array_short_align_2_optional_max_key_cdr_typesize > 16 ? array_short_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = array_short_align_2_optional_max_key_cdr_typesize > 16 ? array_short_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } array_short_align_2_optionalPubSubType::~array_short_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13580,12 +11335,10 @@ bool array_short_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13600,11 +11353,7 @@ bool array_short_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13621,11 +11370,7 @@ bool array_short_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13642,52 +11387,43 @@ bool array_short_align_2_optionalPubSubType::deserialize( return true; } -std::function array_short_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t array_short_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* array_short_align_2_optionalPubSubType::createData() +void* array_short_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new array_short_align_2_optional()); } -void array_short_align_2_optionalPubSubType::deleteData( +void array_short_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool array_short_align_2_optionalPubSubType::getKey( +bool array_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13695,35 +11431,27 @@ bool array_short_align_2_optionalPubSubType::getKey( const array_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), array_short_align_2_optional_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 || array_short_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13736,26 +11464,21 @@ void array_short_align_2_optionalPubSubType::register_type_object_representation array_short_align_4_optionalPubSubType::array_short_align_4_optionalPubSubType() { - setName("array_short_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(array_short_align_4_optional::getMaxCdrSerializedSize()); -#else - array_short_align_4_optional_max_cdr_typesize; -#endif + set_name("array_short_align_4_optional"); + uint32_t type_size = array_short_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = array_short_align_4_optional_max_key_cdr_typesize > 16 ? array_short_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = array_short_align_4_optional_max_key_cdr_typesize > 16 ? array_short_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } array_short_align_4_optionalPubSubType::~array_short_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13773,12 +11496,10 @@ bool array_short_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13793,11 +11514,7 @@ bool array_short_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -13814,11 +11531,7 @@ bool array_short_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -13835,52 +11548,43 @@ bool array_short_align_4_optionalPubSubType::deserialize( return true; } -std::function array_short_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t array_short_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* array_short_align_4_optionalPubSubType::createData() +void* array_short_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new array_short_align_4_optional()); } -void array_short_align_4_optionalPubSubType::deleteData( +void array_short_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool array_short_align_4_optionalPubSubType::getKey( +bool array_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -13888,35 +11592,27 @@ bool array_short_align_4_optionalPubSubType::getKey( const array_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), array_short_align_4_optional_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 || array_short_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -13929,26 +11625,21 @@ void array_short_align_4_optionalPubSubType::register_type_object_representation struct_optionalPubSubType::struct_optionalPubSubType() { - setName("struct_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_optional::getMaxCdrSerializedSize()); -#else - struct_optional_max_cdr_typesize; -#endif + set_name("struct_optional"); + uint32_t type_size = struct_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_optional_max_key_cdr_typesize > 16 ? struct_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_optional_max_key_cdr_typesize > 16 ? struct_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_optionalPubSubType::~struct_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -13966,12 +11657,10 @@ bool struct_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -13986,11 +11675,7 @@ bool struct_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14007,11 +11692,7 @@ bool struct_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14028,52 +11709,43 @@ bool struct_optionalPubSubType::deserialize( return true; } -std::function struct_optionalPubSubType::getSerializedSizeProvider( +uint32_t struct_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* struct_optionalPubSubType::createData() +void* struct_optionalPubSubType::create_data() { return reinterpret_cast(new struct_optional()); } -void struct_optionalPubSubType::deleteData( +void struct_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_optionalPubSubType::getKey( +bool struct_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14081,35 +11753,27 @@ bool struct_optionalPubSubType::getKey( const struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_optional_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 || struct_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14122,26 +11786,21 @@ void struct_optionalPubSubType::register_type_object_representation() struct_align_1_optionalPubSubType::struct_align_1_optionalPubSubType() { - setName("struct_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_align_1_optional::getMaxCdrSerializedSize()); -#else - struct_align_1_optional_max_cdr_typesize; -#endif + set_name("struct_align_1_optional"); + uint32_t type_size = struct_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_align_1_optional_max_key_cdr_typesize > 16 ? struct_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_align_1_optional_max_key_cdr_typesize > 16 ? struct_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_align_1_optionalPubSubType::~struct_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14159,12 +11818,10 @@ bool struct_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14179,11 +11836,7 @@ bool struct_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14200,11 +11853,7 @@ bool struct_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14221,52 +11870,43 @@ bool struct_align_1_optionalPubSubType::deserialize( return true; } -std::function struct_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t struct_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* struct_align_1_optionalPubSubType::createData() +void* struct_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new struct_align_1_optional()); } -void struct_align_1_optionalPubSubType::deleteData( +void struct_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_align_1_optionalPubSubType::getKey( +bool struct_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14274,35 +11914,27 @@ bool struct_align_1_optionalPubSubType::getKey( const struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_align_1_optional_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 || struct_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14315,26 +11947,21 @@ void struct_align_1_optionalPubSubType::register_type_object_representation() struct_align_2_optionalPubSubType::struct_align_2_optionalPubSubType() { - setName("struct_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_align_2_optional::getMaxCdrSerializedSize()); -#else - struct_align_2_optional_max_cdr_typesize; -#endif + set_name("struct_align_2_optional"); + uint32_t type_size = struct_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_align_2_optional_max_key_cdr_typesize > 16 ? struct_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_align_2_optional_max_key_cdr_typesize > 16 ? struct_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_align_2_optionalPubSubType::~struct_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14352,12 +11979,10 @@ bool struct_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14372,11 +11997,7 @@ bool struct_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14393,11 +12014,7 @@ bool struct_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14414,52 +12031,43 @@ bool struct_align_2_optionalPubSubType::deserialize( return true; } -std::function struct_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t struct_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* struct_align_2_optionalPubSubType::createData() +void* struct_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new struct_align_2_optional()); } -void struct_align_2_optionalPubSubType::deleteData( +void struct_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_align_2_optionalPubSubType::getKey( +bool struct_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14467,35 +12075,27 @@ bool struct_align_2_optionalPubSubType::getKey( const struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_align_2_optional_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 || struct_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14508,26 +12108,21 @@ void struct_align_2_optionalPubSubType::register_type_object_representation() struct_align_4_optionalPubSubType::struct_align_4_optionalPubSubType() { - setName("struct_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(struct_align_4_optional::getMaxCdrSerializedSize()); -#else - struct_align_4_optional_max_cdr_typesize; -#endif + set_name("struct_align_4_optional"); + uint32_t type_size = struct_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = struct_align_4_optional_max_key_cdr_typesize > 16 ? struct_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = struct_align_4_optional_max_key_cdr_typesize > 16 ? struct_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } struct_align_4_optionalPubSubType::~struct_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14545,12 +12140,10 @@ bool struct_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14565,11 +12158,7 @@ bool struct_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14586,11 +12175,7 @@ bool struct_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14607,52 +12192,43 @@ bool struct_align_4_optionalPubSubType::deserialize( return true; } -std::function struct_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t struct_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* struct_align_4_optionalPubSubType::createData() +void* struct_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new struct_align_4_optional()); } -void struct_align_4_optionalPubSubType::deleteData( +void struct_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool struct_align_4_optionalPubSubType::getKey( +bool struct_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14660,35 +12236,27 @@ bool struct_align_4_optionalPubSubType::getKey( const struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), struct_align_4_optional_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 || struct_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14701,26 +12269,21 @@ void struct_align_4_optionalPubSubType::register_type_object_representation() InnerStructOptionalPubSubType::InnerStructOptionalPubSubType() { - setName("InnerStructOptional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(InnerStructOptional::getMaxCdrSerializedSize()); -#else - InnerStructOptional_max_cdr_typesize; -#endif + set_name("InnerStructOptional"); + uint32_t type_size = InnerStructOptional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = InnerStructOptional_max_key_cdr_typesize > 16 ? InnerStructOptional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = InnerStructOptional_max_key_cdr_typesize > 16 ? InnerStructOptional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } InnerStructOptionalPubSubType::~InnerStructOptionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14738,12 +12301,10 @@ bool InnerStructOptionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14758,11 +12319,7 @@ bool InnerStructOptionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14779,11 +12336,7 @@ bool InnerStructOptionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14800,52 +12353,43 @@ bool InnerStructOptionalPubSubType::deserialize( return true; } -std::function InnerStructOptionalPubSubType::getSerializedSizeProvider( +uint32_t InnerStructOptionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* InnerStructOptionalPubSubType::createData() +void* InnerStructOptionalPubSubType::create_data() { return reinterpret_cast(new InnerStructOptional()); } -void InnerStructOptionalPubSubType::deleteData( +void InnerStructOptionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool InnerStructOptionalPubSubType::getKey( +bool InnerStructOptionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -14853,35 +12397,27 @@ bool InnerStructOptionalPubSubType::getKey( const InnerStructOptional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), InnerStructOptional_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 || InnerStructOptional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -14894,26 +12430,21 @@ void InnerStructOptionalPubSubType::register_type_object_representation() opt_struct_optionalPubSubType::opt_struct_optionalPubSubType() { - setName("opt_struct_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(opt_struct_optional::getMaxCdrSerializedSize()); -#else - opt_struct_optional_max_cdr_typesize; -#endif + set_name("opt_struct_optional"); + uint32_t type_size = opt_struct_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = opt_struct_optional_max_key_cdr_typesize > 16 ? opt_struct_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = opt_struct_optional_max_key_cdr_typesize > 16 ? opt_struct_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } opt_struct_optionalPubSubType::~opt_struct_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -14931,12 +12462,10 @@ bool opt_struct_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -14951,11 +12480,7 @@ bool opt_struct_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -14972,11 +12497,7 @@ bool opt_struct_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -14993,52 +12514,43 @@ bool opt_struct_optionalPubSubType::deserialize( return true; } -std::function opt_struct_optionalPubSubType::getSerializedSizeProvider( +uint32_t opt_struct_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* opt_struct_optionalPubSubType::createData() +void* opt_struct_optionalPubSubType::create_data() { return reinterpret_cast(new opt_struct_optional()); } -void opt_struct_optionalPubSubType::deleteData( +void opt_struct_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool opt_struct_optionalPubSubType::getKey( +bool opt_struct_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15046,35 +12558,27 @@ bool opt_struct_optionalPubSubType::getKey( const opt_struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), opt_struct_optional_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 || opt_struct_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15087,26 +12591,21 @@ void opt_struct_optionalPubSubType::register_type_object_representation() opt_struct_align_1_optionalPubSubType::opt_struct_align_1_optionalPubSubType() { - setName("opt_struct_align_1_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(opt_struct_align_1_optional::getMaxCdrSerializedSize()); -#else - opt_struct_align_1_optional_max_cdr_typesize; -#endif + set_name("opt_struct_align_1_optional"); + uint32_t type_size = opt_struct_align_1_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = opt_struct_align_1_optional_max_key_cdr_typesize > 16 ? opt_struct_align_1_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = opt_struct_align_1_optional_max_key_cdr_typesize > 16 ? opt_struct_align_1_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } opt_struct_align_1_optionalPubSubType::~opt_struct_align_1_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15124,12 +12623,10 @@ bool opt_struct_align_1_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15144,11 +12641,7 @@ bool opt_struct_align_1_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15165,11 +12658,7 @@ bool opt_struct_align_1_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15186,52 +12675,43 @@ bool opt_struct_align_1_optionalPubSubType::deserialize( return true; } -std::function opt_struct_align_1_optionalPubSubType::getSerializedSizeProvider( +uint32_t opt_struct_align_1_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* opt_struct_align_1_optionalPubSubType::createData() +void* opt_struct_align_1_optionalPubSubType::create_data() { return reinterpret_cast(new opt_struct_align_1_optional()); } -void opt_struct_align_1_optionalPubSubType::deleteData( +void opt_struct_align_1_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool opt_struct_align_1_optionalPubSubType::getKey( +bool opt_struct_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15239,35 +12719,27 @@ bool opt_struct_align_1_optionalPubSubType::getKey( const opt_struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), opt_struct_align_1_optional_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 || opt_struct_align_1_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15280,26 +12752,21 @@ void opt_struct_align_1_optionalPubSubType::register_type_object_representation( opt_struct_align_2_optionalPubSubType::opt_struct_align_2_optionalPubSubType() { - setName("opt_struct_align_2_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(opt_struct_align_2_optional::getMaxCdrSerializedSize()); -#else - opt_struct_align_2_optional_max_cdr_typesize; -#endif + set_name("opt_struct_align_2_optional"); + uint32_t type_size = opt_struct_align_2_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = opt_struct_align_2_optional_max_key_cdr_typesize > 16 ? opt_struct_align_2_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = opt_struct_align_2_optional_max_key_cdr_typesize > 16 ? opt_struct_align_2_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } opt_struct_align_2_optionalPubSubType::~opt_struct_align_2_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15317,12 +12784,10 @@ bool opt_struct_align_2_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15337,11 +12802,7 @@ bool opt_struct_align_2_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15358,11 +12819,7 @@ bool opt_struct_align_2_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15379,52 +12836,43 @@ bool opt_struct_align_2_optionalPubSubType::deserialize( return true; } -std::function opt_struct_align_2_optionalPubSubType::getSerializedSizeProvider( +uint32_t opt_struct_align_2_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* opt_struct_align_2_optionalPubSubType::createData() +void* opt_struct_align_2_optionalPubSubType::create_data() { return reinterpret_cast(new opt_struct_align_2_optional()); } -void opt_struct_align_2_optionalPubSubType::deleteData( +void opt_struct_align_2_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool opt_struct_align_2_optionalPubSubType::getKey( +bool opt_struct_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15432,35 +12880,27 @@ bool opt_struct_align_2_optionalPubSubType::getKey( const opt_struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), opt_struct_align_2_optional_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 || opt_struct_align_2_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -15473,26 +12913,21 @@ void opt_struct_align_2_optionalPubSubType::register_type_object_representation( opt_struct_align_4_optionalPubSubType::opt_struct_align_4_optionalPubSubType() { - setName("opt_struct_align_4_optional"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(opt_struct_align_4_optional::getMaxCdrSerializedSize()); -#else - opt_struct_align_4_optional_max_cdr_typesize; -#endif + set_name("opt_struct_align_4_optional"); + uint32_t type_size = opt_struct_align_4_optional_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = opt_struct_align_4_optional_max_key_cdr_typesize > 16 ? opt_struct_align_4_optional_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = opt_struct_align_4_optional_max_key_cdr_typesize > 16 ? opt_struct_align_4_optional_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } opt_struct_align_4_optionalPubSubType::~opt_struct_align_4_optionalPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -15510,12 +12945,10 @@ bool opt_struct_align_4_optionalPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -15530,11 +12963,7 @@ bool opt_struct_align_4_optionalPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -15551,11 +12980,7 @@ bool opt_struct_align_4_optionalPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -15572,52 +12997,43 @@ bool opt_struct_align_4_optionalPubSubType::deserialize( return true; } -std::function opt_struct_align_4_optionalPubSubType::getSerializedSizeProvider( +uint32_t opt_struct_align_4_optionalPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* opt_struct_align_4_optionalPubSubType::createData() +void* opt_struct_align_4_optionalPubSubType::create_data() { return reinterpret_cast(new opt_struct_align_4_optional()); } -void opt_struct_align_4_optionalPubSubType::deleteData( +void opt_struct_align_4_optionalPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool opt_struct_align_4_optionalPubSubType::getKey( +bool opt_struct_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -15625,35 +13041,27 @@ bool opt_struct_align_4_optionalPubSubType::getKey( const opt_struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), opt_struct_align_4_optional_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 || opt_struct_align_4_optional_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index 83ee020bfe7..9c68a5e0230 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -62,18 +62,18 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2134,18 +2134,18 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2180,8 +2180,8 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2208,18 +2208,18 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2254,8 +2254,8 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2282,18 +2282,18 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2328,8 +2328,8 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2356,18 +2356,18 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2402,8 +2402,8 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2430,18 +2430,18 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2476,8 +2476,8 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2504,18 +2504,18 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2550,8 +2550,8 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2578,18 +2578,18 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2624,8 +2624,8 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2652,18 +2652,18 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2698,8 +2698,8 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2726,18 +2726,18 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2772,8 +2772,8 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2800,18 +2800,18 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2846,8 +2846,8 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2874,18 +2874,18 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2920,8 +2920,8 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2948,18 +2948,18 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2994,8 +2994,8 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3022,18 +3022,18 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3068,8 +3068,8 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3096,18 +3096,18 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3142,8 +3142,8 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3170,18 +3170,18 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3216,8 +3216,8 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3244,18 +3244,18 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3290,8 +3290,8 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3318,18 +3318,18 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3364,8 +3364,8 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3392,18 +3392,18 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3438,8 +3438,8 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3466,18 +3466,18 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3512,8 +3512,8 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3540,18 +3540,18 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3586,8 +3586,8 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3614,18 +3614,18 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3660,8 +3660,8 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3688,18 +3688,18 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3734,8 +3734,8 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3762,18 +3762,18 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3808,8 +3808,8 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3836,18 +3836,18 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3882,8 +3882,8 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3910,18 +3910,18 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3956,8 +3956,8 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3984,18 +3984,18 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4030,8 +4030,8 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4058,18 +4058,18 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4104,8 +4104,8 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4132,18 +4132,18 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4178,8 +4178,8 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4206,18 +4206,18 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4252,8 +4252,8 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4280,18 +4280,18 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4326,8 +4326,8 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4354,18 +4354,18 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4400,8 +4400,8 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4428,18 +4428,18 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4474,8 +4474,8 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4502,18 +4502,18 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4548,8 +4548,8 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4576,18 +4576,18 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4622,8 +4622,8 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4650,18 +4650,18 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4696,8 +4696,8 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4724,18 +4724,18 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4770,8 +4770,8 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4798,18 +4798,18 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4844,8 +4844,8 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4872,18 +4872,18 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4918,8 +4918,8 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -4946,18 +4946,18 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -4992,8 +4992,8 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5020,18 +5020,18 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5066,8 +5066,8 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5094,18 +5094,18 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5140,8 +5140,8 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5168,18 +5168,18 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5214,8 +5214,8 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5242,18 +5242,18 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5288,8 +5288,8 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5316,18 +5316,18 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5362,8 +5362,8 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5390,18 +5390,18 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5436,8 +5436,8 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5464,18 +5464,18 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5510,8 +5510,8 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5538,18 +5538,18 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5584,8 +5584,8 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5612,18 +5612,18 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5658,8 +5658,8 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5686,18 +5686,18 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5732,8 +5732,8 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5760,18 +5760,18 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5806,8 +5806,8 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5834,18 +5834,18 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5880,8 +5880,8 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5908,18 +5908,18 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -5954,8 +5954,8 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -5982,18 +5982,18 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -6028,8 +6028,8 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/primitivesPubSubTypes.cxx b/test/dds-types-test/primitivesPubSubTypes.cxx index 67da733d761..56575e68227 100644 --- a/test/dds-types-test/primitivesPubSubTypes.cxx +++ b/test/dds-types-test/primitivesPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ShortStructPubSubType::ShortStructPubSubType() { - setName("ShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ShortStruct::getMaxCdrSerializedSize()); -#else - ShortStruct_max_cdr_typesize; -#endif + set_name("ShortStruct"); + uint32_t type_size = ShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ShortStruct_max_key_cdr_typesize > 16 ? ShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ShortStruct_max_key_cdr_typesize > 16 ? ShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ShortStructPubSubType::~ShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool ShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool ShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool ShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool ShortStructPubSubType::deserialize( return true; } -std::function ShortStructPubSubType::getSerializedSizeProvider( +uint32_t ShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ShortStructPubSubType::create_data() { return reinterpret_cast(new ShortStruct()); } -void ShortStructPubSubType::deleteData( +void ShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ShortStructPubSubType::getKey( +bool ShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool ShortStructPubSubType::getKey( const ShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ShortStruct_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 || ShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void ShortStructPubSubType::register_type_object_representation() UShortStructPubSubType::UShortStructPubSubType() { - setName("UShortStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UShortStruct::getMaxCdrSerializedSize()); -#else - UShortStruct_max_cdr_typesize; -#endif + set_name("UShortStruct"); + uint32_t type_size = UShortStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UShortStruct_max_key_cdr_typesize > 16 ? UShortStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UShortStruct_max_key_cdr_typesize > 16 ? UShortStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UShortStructPubSubType::~UShortStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool UShortStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool UShortStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool UShortStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool UShortStructPubSubType::deserialize( return true; } -std::function UShortStructPubSubType::getSerializedSizeProvider( +uint32_t UShortStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UShortStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UShortStructPubSubType::create_data() { return reinterpret_cast(new UShortStruct()); } -void UShortStructPubSubType::deleteData( +void UShortStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UShortStructPubSubType::getKey( +bool UShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool UShortStructPubSubType::getKey( const UShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UShortStruct_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 || UShortStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void UShortStructPubSubType::register_type_object_representation() LongStructPubSubType::LongStructPubSubType() { - setName("LongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LongStruct::getMaxCdrSerializedSize()); -#else - LongStruct_max_cdr_typesize; -#endif + set_name("LongStruct"); + uint32_t type_size = LongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LongStruct_max_key_cdr_typesize > 16 ? LongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LongStruct_max_key_cdr_typesize > 16 ? LongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LongStructPubSubType::~LongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool LongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool LongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool LongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool LongStructPubSubType::deserialize( return true; } -std::function LongStructPubSubType::getSerializedSizeProvider( +uint32_t LongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* LongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* LongStructPubSubType::create_data() { return reinterpret_cast(new LongStruct()); } -void LongStructPubSubType::deleteData( +void LongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LongStructPubSubType::getKey( +bool LongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool LongStructPubSubType::getKey( const LongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LongStruct_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 || LongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void LongStructPubSubType::register_type_object_representation() ULongStructPubSubType::ULongStructPubSubType() { - setName("ULongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ULongStruct::getMaxCdrSerializedSize()); -#else - ULongStruct_max_cdr_typesize; -#endif + set_name("ULongStruct"); + uint32_t type_size = ULongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ULongStruct_max_key_cdr_typesize > 16 ? ULongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ULongStruct_max_key_cdr_typesize > 16 ? ULongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ULongStructPubSubType::~ULongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool ULongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool ULongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool ULongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool ULongStructPubSubType::deserialize( return true; } -std::function ULongStructPubSubType::getSerializedSizeProvider( +uint32_t ULongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ULongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ULongStructPubSubType::create_data() { return reinterpret_cast(new ULongStruct()); } -void ULongStructPubSubType::deleteData( +void ULongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ULongStructPubSubType::getKey( +bool ULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool ULongStructPubSubType::getKey( const ULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ULongStruct_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 || ULongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void ULongStructPubSubType::register_type_object_representation() LongLongStructPubSubType::LongLongStructPubSubType() { - setName("LongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LongLongStruct::getMaxCdrSerializedSize()); -#else - LongLongStruct_max_cdr_typesize; -#endif + set_name("LongLongStruct"); + uint32_t type_size = LongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LongLongStruct_max_key_cdr_typesize > 16 ? LongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LongLongStruct_max_key_cdr_typesize > 16 ? LongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LongLongStructPubSubType::~LongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool LongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool LongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool LongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool LongLongStructPubSubType::deserialize( return true; } -std::function LongLongStructPubSubType::getSerializedSizeProvider( +uint32_t LongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* LongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* LongLongStructPubSubType::create_data() { return reinterpret_cast(new LongLongStruct()); } -void LongLongStructPubSubType::deleteData( +void LongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LongLongStructPubSubType::getKey( +bool LongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool LongLongStructPubSubType::getKey( const LongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LongLongStruct_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 || LongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void LongLongStructPubSubType::register_type_object_representation() ULongLongStructPubSubType::ULongLongStructPubSubType() { - setName("ULongLongStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ULongLongStruct::getMaxCdrSerializedSize()); -#else - ULongLongStruct_max_cdr_typesize; -#endif + set_name("ULongLongStruct"); + uint32_t type_size = ULongLongStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ULongLongStruct_max_key_cdr_typesize > 16 ? ULongLongStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ULongLongStruct_max_key_cdr_typesize > 16 ? ULongLongStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ULongLongStructPubSubType::~ULongLongStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool ULongLongStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool ULongLongStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool ULongLongStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool ULongLongStructPubSubType::deserialize( return true; } -std::function ULongLongStructPubSubType::getSerializedSizeProvider( +uint32_t ULongLongStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ULongLongStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ULongLongStructPubSubType::create_data() { return reinterpret_cast(new ULongLongStruct()); } -void ULongLongStructPubSubType::deleteData( +void ULongLongStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ULongLongStructPubSubType::getKey( +bool ULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool ULongLongStructPubSubType::getKey( const ULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ULongLongStruct_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 || ULongLongStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void ULongLongStructPubSubType::register_type_object_representation() FloatStructPubSubType::FloatStructPubSubType() { - setName("FloatStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FloatStruct::getMaxCdrSerializedSize()); -#else - FloatStruct_max_cdr_typesize; -#endif + set_name("FloatStruct"); + uint32_t type_size = FloatStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FloatStruct_max_key_cdr_typesize > 16 ? FloatStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FloatStruct_max_key_cdr_typesize > 16 ? FloatStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FloatStructPubSubType::~FloatStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool FloatStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool FloatStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool FloatStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool FloatStructPubSubType::deserialize( return true; } -std::function FloatStructPubSubType::getSerializedSizeProvider( +uint32_t FloatStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FloatStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FloatStructPubSubType::create_data() { return reinterpret_cast(new FloatStruct()); } -void FloatStructPubSubType::deleteData( +void FloatStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FloatStructPubSubType::getKey( +bool FloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool FloatStructPubSubType::getKey( const FloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FloatStruct_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 || FloatStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void FloatStructPubSubType::register_type_object_representation() DoubleStructPubSubType::DoubleStructPubSubType() { - setName("DoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(DoubleStruct::getMaxCdrSerializedSize()); -#else - DoubleStruct_max_cdr_typesize; -#endif + set_name("DoubleStruct"); + uint32_t type_size = DoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = DoubleStruct_max_key_cdr_typesize > 16 ? DoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = DoubleStruct_max_key_cdr_typesize > 16 ? DoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } DoubleStructPubSubType::~DoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool DoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool DoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool DoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool DoubleStructPubSubType::deserialize( return true; } -std::function DoubleStructPubSubType::getSerializedSizeProvider( +uint32_t DoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* DoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* DoubleStructPubSubType::create_data() { return reinterpret_cast(new DoubleStruct()); } -void DoubleStructPubSubType::deleteData( +void DoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool DoubleStructPubSubType::getKey( +bool DoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool DoubleStructPubSubType::getKey( const DoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), DoubleStruct_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 || DoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void DoubleStructPubSubType::register_type_object_representation() LongDoubleStructPubSubType::LongDoubleStructPubSubType() { - setName("LongDoubleStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LongDoubleStruct::getMaxCdrSerializedSize()); -#else - LongDoubleStruct_max_cdr_typesize; -#endif + set_name("LongDoubleStruct"); + uint32_t type_size = LongDoubleStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LongDoubleStruct_max_key_cdr_typesize > 16 ? LongDoubleStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LongDoubleStruct_max_key_cdr_typesize > 16 ? LongDoubleStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LongDoubleStructPubSubType::~LongDoubleStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool LongDoubleStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool LongDoubleStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool LongDoubleStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool LongDoubleStructPubSubType::deserialize( return true; } -std::function LongDoubleStructPubSubType::getSerializedSizeProvider( +uint32_t LongDoubleStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* LongDoubleStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* LongDoubleStructPubSubType::create_data() { return reinterpret_cast(new LongDoubleStruct()); } -void LongDoubleStructPubSubType::deleteData( +void LongDoubleStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LongDoubleStructPubSubType::getKey( +bool LongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool LongDoubleStructPubSubType::getKey( const LongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LongDoubleStruct_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 || LongDoubleStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void LongDoubleStructPubSubType::register_type_object_representation() BooleanStructPubSubType::BooleanStructPubSubType() { - setName("BooleanStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BooleanStruct::getMaxCdrSerializedSize()); -#else - BooleanStruct_max_cdr_typesize; -#endif + set_name("BooleanStruct"); + uint32_t type_size = BooleanStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BooleanStruct_max_key_cdr_typesize > 16 ? BooleanStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BooleanStruct_max_key_cdr_typesize > 16 ? BooleanStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BooleanStructPubSubType::~BooleanStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool BooleanStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool BooleanStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool BooleanStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool BooleanStructPubSubType::deserialize( return true; } -std::function BooleanStructPubSubType::getSerializedSizeProvider( +uint32_t BooleanStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BooleanStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BooleanStructPubSubType::create_data() { return reinterpret_cast(new BooleanStruct()); } -void BooleanStructPubSubType::deleteData( +void BooleanStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BooleanStructPubSubType::getKey( +bool BooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool BooleanStructPubSubType::getKey( const BooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BooleanStruct_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 || BooleanStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void BooleanStructPubSubType::register_type_object_representation() OctetStructPubSubType::OctetStructPubSubType() { - setName("OctetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(OctetStruct::getMaxCdrSerializedSize()); -#else - OctetStruct_max_cdr_typesize; -#endif + set_name("OctetStruct"); + uint32_t type_size = OctetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = OctetStruct_max_key_cdr_typesize > 16 ? OctetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = OctetStruct_max_key_cdr_typesize > 16 ? OctetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } OctetStructPubSubType::~OctetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool OctetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool OctetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool OctetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool OctetStructPubSubType::deserialize( return true; } -std::function OctetStructPubSubType::getSerializedSizeProvider( +uint32_t OctetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* OctetStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* OctetStructPubSubType::create_data() { return reinterpret_cast(new OctetStruct()); } -void OctetStructPubSubType::deleteData( +void OctetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool OctetStructPubSubType::getKey( +bool OctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool OctetStructPubSubType::getKey( const OctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), OctetStruct_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 || OctetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void OctetStructPubSubType::register_type_object_representation() CharStructPubSubType::CharStructPubSubType() { - setName("CharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(CharStruct::getMaxCdrSerializedSize()); -#else - CharStruct_max_cdr_typesize; -#endif + set_name("CharStruct"); + uint32_t type_size = CharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = CharStruct_max_key_cdr_typesize > 16 ? CharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = CharStruct_max_key_cdr_typesize > 16 ? CharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } CharStructPubSubType::~CharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool CharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool CharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool CharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool CharStructPubSubType::deserialize( return true; } -std::function CharStructPubSubType::getSerializedSizeProvider( +uint32_t CharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* CharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* CharStructPubSubType::create_data() { return reinterpret_cast(new CharStruct()); } -void CharStructPubSubType::deleteData( +void CharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool CharStructPubSubType::getKey( +bool CharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool CharStructPubSubType::getKey( const CharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), CharStruct_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 || CharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void CharStructPubSubType::register_type_object_representation() WCharStructPubSubType::WCharStructPubSubType() { - setName("WCharStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(WCharStruct::getMaxCdrSerializedSize()); -#else - WCharStruct_max_cdr_typesize; -#endif + set_name("WCharStruct"); + uint32_t type_size = WCharStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = WCharStruct_max_key_cdr_typesize > 16 ? WCharStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = WCharStruct_max_key_cdr_typesize > 16 ? WCharStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } WCharStructPubSubType::~WCharStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool WCharStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool WCharStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool WCharStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool WCharStructPubSubType::deserialize( return true; } -std::function WCharStructPubSubType::getSerializedSizeProvider( +uint32_t WCharStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* WCharStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* WCharStructPubSubType::create_data() { return reinterpret_cast(new WCharStruct()); } -void WCharStructPubSubType::deleteData( +void WCharStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool WCharStructPubSubType::getKey( +bool WCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool WCharStructPubSubType::getKey( const WCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), WCharStruct_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 || WCharStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void WCharStructPubSubType::register_type_object_representation() Int8StructPubSubType::Int8StructPubSubType() { - setName("Int8Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Int8Struct::getMaxCdrSerializedSize()); -#else - Int8Struct_max_cdr_typesize; -#endif + set_name("Int8Struct"); + uint32_t type_size = Int8Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Int8Struct_max_key_cdr_typesize > 16 ? Int8Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Int8Struct_max_key_cdr_typesize > 16 ? Int8Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Int8StructPubSubType::~Int8StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool Int8StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool Int8StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool Int8StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool Int8StructPubSubType::deserialize( return true; } -std::function Int8StructPubSubType::getSerializedSizeProvider( +uint32_t Int8StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Int8StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Int8StructPubSubType::create_data() { return reinterpret_cast(new Int8Struct()); } -void Int8StructPubSubType::deleteData( +void Int8StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Int8StructPubSubType::getKey( +bool Int8StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool Int8StructPubSubType::getKey( const Int8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Int8Struct_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 || Int8Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void Int8StructPubSubType::register_type_object_representation() Uint8StructPubSubType::Uint8StructPubSubType() { - setName("Uint8Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Uint8Struct::getMaxCdrSerializedSize()); -#else - Uint8Struct_max_cdr_typesize; -#endif + set_name("Uint8Struct"); + uint32_t type_size = Uint8Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Uint8Struct_max_key_cdr_typesize > 16 ? Uint8Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Uint8Struct_max_key_cdr_typesize > 16 ? Uint8Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Uint8StructPubSubType::~Uint8StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool Uint8StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool Uint8StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool Uint8StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool Uint8StructPubSubType::deserialize( return true; } -std::function Uint8StructPubSubType::getSerializedSizeProvider( +uint32_t Uint8StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Uint8StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Uint8StructPubSubType::create_data() { return reinterpret_cast(new Uint8Struct()); } -void Uint8StructPubSubType::deleteData( +void Uint8StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Uint8StructPubSubType::getKey( +bool Uint8StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool Uint8StructPubSubType::getKey( const Uint8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Uint8Struct_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 || Uint8Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void Uint8StructPubSubType::register_type_object_representation() Int16StructPubSubType::Int16StructPubSubType() { - setName("Int16Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Int16Struct::getMaxCdrSerializedSize()); -#else - Int16Struct_max_cdr_typesize; -#endif + set_name("Int16Struct"); + uint32_t type_size = Int16Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Int16Struct_max_key_cdr_typesize > 16 ? Int16Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Int16Struct_max_key_cdr_typesize > 16 ? Int16Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Int16StructPubSubType::~Int16StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool Int16StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool Int16StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool Int16StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool Int16StructPubSubType::deserialize( return true; } -std::function Int16StructPubSubType::getSerializedSizeProvider( +uint32_t Int16StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Int16StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Int16StructPubSubType::create_data() { return reinterpret_cast(new Int16Struct()); } -void Int16StructPubSubType::deleteData( +void Int16StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Int16StructPubSubType::getKey( +bool Int16StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool Int16StructPubSubType::getKey( const Int16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Int16Struct_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 || Int16Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void Int16StructPubSubType::register_type_object_representation() Uint16StructPubSubType::Uint16StructPubSubType() { - setName("Uint16Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Uint16Struct::getMaxCdrSerializedSize()); -#else - Uint16Struct_max_cdr_typesize; -#endif + set_name("Uint16Struct"); + uint32_t type_size = Uint16Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Uint16Struct_max_key_cdr_typesize > 16 ? Uint16Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Uint16Struct_max_key_cdr_typesize > 16 ? Uint16Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Uint16StructPubSubType::~Uint16StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool Uint16StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool Uint16StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool Uint16StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool Uint16StructPubSubType::deserialize( return true; } -std::function Uint16StructPubSubType::getSerializedSizeProvider( +uint32_t Uint16StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Uint16StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Uint16StructPubSubType::create_data() { return reinterpret_cast(new Uint16Struct()); } -void Uint16StructPubSubType::deleteData( +void Uint16StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Uint16StructPubSubType::getKey( +bool Uint16StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool Uint16StructPubSubType::getKey( const Uint16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Uint16Struct_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 || Uint16Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void Uint16StructPubSubType::register_type_object_representation() Int32StructPubSubType::Int32StructPubSubType() { - setName("Int32Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Int32Struct::getMaxCdrSerializedSize()); -#else - Int32Struct_max_cdr_typesize; -#endif + set_name("Int32Struct"); + uint32_t type_size = Int32Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Int32Struct_max_key_cdr_typesize > 16 ? Int32Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Int32Struct_max_key_cdr_typesize > 16 ? Int32Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Int32StructPubSubType::~Int32StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool Int32StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool Int32StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool Int32StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool Int32StructPubSubType::deserialize( return true; } -std::function Int32StructPubSubType::getSerializedSizeProvider( +uint32_t Int32StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Int32StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Int32StructPubSubType::create_data() { return reinterpret_cast(new Int32Struct()); } -void Int32StructPubSubType::deleteData( +void Int32StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Int32StructPubSubType::getKey( +bool Int32StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool Int32StructPubSubType::getKey( const Int32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Int32Struct_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 || Int32Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void Int32StructPubSubType::register_type_object_representation() Uint32StructPubSubType::Uint32StructPubSubType() { - setName("Uint32Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Uint32Struct::getMaxCdrSerializedSize()); -#else - Uint32Struct_max_cdr_typesize; -#endif + set_name("Uint32Struct"); + uint32_t type_size = Uint32Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Uint32Struct_max_key_cdr_typesize > 16 ? Uint32Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Uint32Struct_max_key_cdr_typesize > 16 ? Uint32Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Uint32StructPubSubType::~Uint32StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool Uint32StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool Uint32StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool Uint32StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool Uint32StructPubSubType::deserialize( return true; } -std::function Uint32StructPubSubType::getSerializedSizeProvider( +uint32_t Uint32StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Uint32StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Uint32StructPubSubType::create_data() { return reinterpret_cast(new Uint32Struct()); } -void Uint32StructPubSubType::deleteData( +void Uint32StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Uint32StructPubSubType::getKey( +bool Uint32StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool Uint32StructPubSubType::getKey( const Uint32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Uint32Struct_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 || Uint32Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void Uint32StructPubSubType::register_type_object_representation() Int64StructPubSubType::Int64StructPubSubType() { - setName("Int64Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Int64Struct::getMaxCdrSerializedSize()); -#else - Int64Struct_max_cdr_typesize; -#endif + set_name("Int64Struct"); + uint32_t type_size = Int64Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Int64Struct_max_key_cdr_typesize > 16 ? Int64Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Int64Struct_max_key_cdr_typesize > 16 ? Int64Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Int64StructPubSubType::~Int64StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool Int64StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool Int64StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool Int64StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool Int64StructPubSubType::deserialize( return true; } -std::function Int64StructPubSubType::getSerializedSizeProvider( +uint32_t Int64StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Int64StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Int64StructPubSubType::create_data() { return reinterpret_cast(new Int64Struct()); } -void Int64StructPubSubType::deleteData( +void Int64StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Int64StructPubSubType::getKey( +bool Int64StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool Int64StructPubSubType::getKey( const Int64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Int64Struct_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 || Int64Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void Int64StructPubSubType::register_type_object_representation() Uint64StructPubSubType::Uint64StructPubSubType() { - setName("Uint64Struct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Uint64Struct::getMaxCdrSerializedSize()); -#else - Uint64Struct_max_cdr_typesize; -#endif + set_name("Uint64Struct"); + uint32_t type_size = Uint64Struct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Uint64Struct_max_key_cdr_typesize > 16 ? Uint64Struct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Uint64Struct_max_key_cdr_typesize > 16 ? Uint64Struct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } Uint64StructPubSubType::~Uint64StructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool Uint64StructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool Uint64StructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool Uint64StructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool Uint64StructPubSubType::deserialize( return true; } -std::function Uint64StructPubSubType::getSerializedSizeProvider( +uint32_t Uint64StructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* Uint64StructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* Uint64StructPubSubType::create_data() { return reinterpret_cast(new Uint64Struct()); } -void Uint64StructPubSubType::deleteData( +void Uint64StructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool Uint64StructPubSubType::getKey( +bool Uint64StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool Uint64StructPubSubType::getKey( const Uint64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Uint64Struct_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 || Uint64Struct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index 447bffadb95..ae33bd73c21 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -61,18 +61,18 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -135,18 +135,18 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -181,8 +181,8 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -209,18 +209,18 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -255,8 +255,8 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -283,18 +283,18 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -329,8 +329,8 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -357,18 +357,18 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -403,8 +403,8 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -431,18 +431,18 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -477,8 +477,8 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -505,18 +505,18 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -551,8 +551,8 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -579,18 +579,18 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -625,8 +625,8 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -653,18 +653,18 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -699,8 +699,8 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -727,18 +727,18 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -773,8 +773,8 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -801,18 +801,18 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -847,8 +847,8 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -875,18 +875,18 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -921,8 +921,8 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -949,18 +949,18 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -995,8 +995,8 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1023,18 +1023,18 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1069,8 +1069,8 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1097,18 +1097,18 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1143,8 +1143,8 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1171,18 +1171,18 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1217,8 +1217,8 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1245,18 +1245,18 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1291,8 +1291,8 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1319,18 +1319,18 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1365,8 +1365,8 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1393,18 +1393,18 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1439,8 +1439,8 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1467,18 +1467,18 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1513,8 +1513,8 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1541,18 +1541,18 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1587,8 +1587,8 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.cxx b/test/dds-types-test/relative_path_includePubSubTypes.cxx index 98eb2c99806..8faddd78f8d 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.cxx +++ b/test/dds-types-test/relative_path_includePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; RelativePathIncludeStructPubSubType::RelativePathIncludeStructPubSubType() { - setName("RelativePathIncludeStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(RelativePathIncludeStruct::getMaxCdrSerializedSize()); -#else - RelativePathIncludeStruct_max_cdr_typesize; -#endif + set_name("RelativePathIncludeStruct"); + uint32_t type_size = RelativePathIncludeStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = RelativePathIncludeStruct_max_key_cdr_typesize > 16 ? RelativePathIncludeStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = RelativePathIncludeStruct_max_key_cdr_typesize > 16 ? RelativePathIncludeStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } RelativePathIncludeStructPubSubType::~RelativePathIncludeStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool RelativePathIncludeStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool RelativePathIncludeStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool RelativePathIncludeStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool RelativePathIncludeStructPubSubType::deserialize( return true; } -std::function RelativePathIncludeStructPubSubType::getSerializedSizeProvider( +uint32_t RelativePathIncludeStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* RelativePathIncludeStructPubSubType::createData() +void* RelativePathIncludeStructPubSubType::create_data() { return reinterpret_cast(new RelativePathIncludeStruct()); } -void RelativePathIncludeStructPubSubType::deleteData( +void RelativePathIncludeStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool RelativePathIncludeStructPubSubType::getKey( +bool RelativePathIncludeStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool RelativePathIncludeStructPubSubType::getKey( const RelativePathIncludeStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), RelativePathIncludeStruct_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 || RelativePathIncludeStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index 262819942cc..b38202694c8 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -62,18 +62,18 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/sequencesPubSubTypes.cxx b/test/dds-types-test/sequencesPubSubTypes.cxx index fa8daeddeaf..4c34a3495f4 100644 --- a/test/dds-types-test/sequencesPubSubTypes.cxx +++ b/test/dds-types-test/sequencesPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; SequenceShortPubSubType::SequenceShortPubSubType() { - setName("SequenceShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceShort::getMaxCdrSerializedSize()); -#else - SequenceShort_max_cdr_typesize; -#endif + set_name("SequenceShort"); + uint32_t type_size = SequenceShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceShort_max_key_cdr_typesize > 16 ? SequenceShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceShort_max_key_cdr_typesize > 16 ? SequenceShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceShortPubSubType::~SequenceShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool SequenceShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool SequenceShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool SequenceShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool SequenceShortPubSubType::deserialize( return true; } -std::function SequenceShortPubSubType::getSerializedSizeProvider( +uint32_t SequenceShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceShortPubSubType::create_data() { return reinterpret_cast(new SequenceShort()); } -void SequenceShortPubSubType::deleteData( +void SequenceShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceShortPubSubType::getKey( +bool SequenceShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool SequenceShortPubSubType::getKey( const SequenceShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceShort_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 || SequenceShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void SequenceShortPubSubType::register_type_object_representation() SequenceUShortPubSubType::SequenceUShortPubSubType() { - setName("SequenceUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceUShort::getMaxCdrSerializedSize()); -#else - SequenceUShort_max_cdr_typesize; -#endif + set_name("SequenceUShort"); + uint32_t type_size = SequenceUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceUShort_max_key_cdr_typesize > 16 ? SequenceUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceUShort_max_key_cdr_typesize > 16 ? SequenceUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceUShortPubSubType::~SequenceUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool SequenceUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool SequenceUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool SequenceUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool SequenceUShortPubSubType::deserialize( return true; } -std::function SequenceUShortPubSubType::getSerializedSizeProvider( +uint32_t SequenceUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceUShortPubSubType::create_data() { return reinterpret_cast(new SequenceUShort()); } -void SequenceUShortPubSubType::deleteData( +void SequenceUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceUShortPubSubType::getKey( +bool SequenceUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool SequenceUShortPubSubType::getKey( const SequenceUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceUShort_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 || SequenceUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void SequenceUShortPubSubType::register_type_object_representation() SequenceLongPubSubType::SequenceLongPubSubType() { - setName("SequenceLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceLong::getMaxCdrSerializedSize()); -#else - SequenceLong_max_cdr_typesize; -#endif + set_name("SequenceLong"); + uint32_t type_size = SequenceLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceLong_max_key_cdr_typesize > 16 ? SequenceLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceLong_max_key_cdr_typesize > 16 ? SequenceLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceLongPubSubType::~SequenceLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool SequenceLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool SequenceLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool SequenceLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool SequenceLongPubSubType::deserialize( return true; } -std::function SequenceLongPubSubType::getSerializedSizeProvider( +uint32_t SequenceLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceLongPubSubType::create_data() { return reinterpret_cast(new SequenceLong()); } -void SequenceLongPubSubType::deleteData( +void SequenceLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceLongPubSubType::getKey( +bool SequenceLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool SequenceLongPubSubType::getKey( const SequenceLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceLong_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 || SequenceLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void SequenceLongPubSubType::register_type_object_representation() SequenceULongPubSubType::SequenceULongPubSubType() { - setName("SequenceULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceULong::getMaxCdrSerializedSize()); -#else - SequenceULong_max_cdr_typesize; -#endif + set_name("SequenceULong"); + uint32_t type_size = SequenceULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceULong_max_key_cdr_typesize > 16 ? SequenceULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceULong_max_key_cdr_typesize > 16 ? SequenceULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceULongPubSubType::~SequenceULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool SequenceULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool SequenceULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool SequenceULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool SequenceULongPubSubType::deserialize( return true; } -std::function SequenceULongPubSubType::getSerializedSizeProvider( +uint32_t SequenceULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceULongPubSubType::create_data() { return reinterpret_cast(new SequenceULong()); } -void SequenceULongPubSubType::deleteData( +void SequenceULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceULongPubSubType::getKey( +bool SequenceULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool SequenceULongPubSubType::getKey( const SequenceULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceULong_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 || SequenceULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void SequenceULongPubSubType::register_type_object_representation() SequenceLongLongPubSubType::SequenceLongLongPubSubType() { - setName("SequenceLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceLongLong::getMaxCdrSerializedSize()); -#else - SequenceLongLong_max_cdr_typesize; -#endif + set_name("SequenceLongLong"); + uint32_t type_size = SequenceLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceLongLong_max_key_cdr_typesize > 16 ? SequenceLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceLongLong_max_key_cdr_typesize > 16 ? SequenceLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceLongLongPubSubType::~SequenceLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool SequenceLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool SequenceLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool SequenceLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool SequenceLongLongPubSubType::deserialize( return true; } -std::function SequenceLongLongPubSubType::getSerializedSizeProvider( +uint32_t SequenceLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceLongLongPubSubType::create_data() { return reinterpret_cast(new SequenceLongLong()); } -void SequenceLongLongPubSubType::deleteData( +void SequenceLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceLongLongPubSubType::getKey( +bool SequenceLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool SequenceLongLongPubSubType::getKey( const SequenceLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceLongLong_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 || SequenceLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void SequenceLongLongPubSubType::register_type_object_representation() SequenceULongLongPubSubType::SequenceULongLongPubSubType() { - setName("SequenceULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceULongLong::getMaxCdrSerializedSize()); -#else - SequenceULongLong_max_cdr_typesize; -#endif + set_name("SequenceULongLong"); + uint32_t type_size = SequenceULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceULongLong_max_key_cdr_typesize > 16 ? SequenceULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceULongLong_max_key_cdr_typesize > 16 ? SequenceULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceULongLongPubSubType::~SequenceULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool SequenceULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool SequenceULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool SequenceULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool SequenceULongLongPubSubType::deserialize( return true; } -std::function SequenceULongLongPubSubType::getSerializedSizeProvider( +uint32_t SequenceULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceULongLongPubSubType::create_data() { return reinterpret_cast(new SequenceULongLong()); } -void SequenceULongLongPubSubType::deleteData( +void SequenceULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceULongLongPubSubType::getKey( +bool SequenceULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool SequenceULongLongPubSubType::getKey( const SequenceULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceULongLong_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 || SequenceULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void SequenceULongLongPubSubType::register_type_object_representation() SequenceFloatPubSubType::SequenceFloatPubSubType() { - setName("SequenceFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceFloat::getMaxCdrSerializedSize()); -#else - SequenceFloat_max_cdr_typesize; -#endif + set_name("SequenceFloat"); + uint32_t type_size = SequenceFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceFloat_max_key_cdr_typesize > 16 ? SequenceFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceFloat_max_key_cdr_typesize > 16 ? SequenceFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceFloatPubSubType::~SequenceFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool SequenceFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool SequenceFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool SequenceFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool SequenceFloatPubSubType::deserialize( return true; } -std::function SequenceFloatPubSubType::getSerializedSizeProvider( +uint32_t SequenceFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceFloatPubSubType::create_data() { return reinterpret_cast(new SequenceFloat()); } -void SequenceFloatPubSubType::deleteData( +void SequenceFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceFloatPubSubType::getKey( +bool SequenceFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool SequenceFloatPubSubType::getKey( const SequenceFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceFloat_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 || SequenceFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void SequenceFloatPubSubType::register_type_object_representation() SequenceDoublePubSubType::SequenceDoublePubSubType() { - setName("SequenceDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceDouble::getMaxCdrSerializedSize()); -#else - SequenceDouble_max_cdr_typesize; -#endif + set_name("SequenceDouble"); + uint32_t type_size = SequenceDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceDouble_max_key_cdr_typesize > 16 ? SequenceDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceDouble_max_key_cdr_typesize > 16 ? SequenceDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceDoublePubSubType::~SequenceDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool SequenceDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool SequenceDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool SequenceDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool SequenceDoublePubSubType::deserialize( return true; } -std::function SequenceDoublePubSubType::getSerializedSizeProvider( +uint32_t SequenceDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceDoublePubSubType::create_data() { return reinterpret_cast(new SequenceDouble()); } -void SequenceDoublePubSubType::deleteData( +void SequenceDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceDoublePubSubType::getKey( +bool SequenceDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool SequenceDoublePubSubType::getKey( const SequenceDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceDouble_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 || SequenceDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void SequenceDoublePubSubType::register_type_object_representation() SequenceLongDoublePubSubType::SequenceLongDoublePubSubType() { - setName("SequenceLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceLongDouble::getMaxCdrSerializedSize()); -#else - SequenceLongDouble_max_cdr_typesize; -#endif + set_name("SequenceLongDouble"); + uint32_t type_size = SequenceLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceLongDouble_max_key_cdr_typesize > 16 ? SequenceLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceLongDouble_max_key_cdr_typesize > 16 ? SequenceLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceLongDoublePubSubType::~SequenceLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool SequenceLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool SequenceLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool SequenceLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool SequenceLongDoublePubSubType::deserialize( return true; } -std::function SequenceLongDoublePubSubType::getSerializedSizeProvider( +uint32_t SequenceLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceLongDoublePubSubType::create_data() { return reinterpret_cast(new SequenceLongDouble()); } -void SequenceLongDoublePubSubType::deleteData( +void SequenceLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceLongDoublePubSubType::getKey( +bool SequenceLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool SequenceLongDoublePubSubType::getKey( const SequenceLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceLongDouble_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 || SequenceLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void SequenceLongDoublePubSubType::register_type_object_representation() SequenceBooleanPubSubType::SequenceBooleanPubSubType() { - setName("SequenceBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceBoolean::getMaxCdrSerializedSize()); -#else - SequenceBoolean_max_cdr_typesize; -#endif + set_name("SequenceBoolean"); + uint32_t type_size = SequenceBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceBoolean_max_key_cdr_typesize > 16 ? SequenceBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceBoolean_max_key_cdr_typesize > 16 ? SequenceBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceBooleanPubSubType::~SequenceBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool SequenceBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool SequenceBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool SequenceBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool SequenceBooleanPubSubType::deserialize( return true; } -std::function SequenceBooleanPubSubType::getSerializedSizeProvider( +uint32_t SequenceBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceBooleanPubSubType::create_data() { return reinterpret_cast(new SequenceBoolean()); } -void SequenceBooleanPubSubType::deleteData( +void SequenceBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceBooleanPubSubType::getKey( +bool SequenceBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool SequenceBooleanPubSubType::getKey( const SequenceBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceBoolean_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 || SequenceBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void SequenceBooleanPubSubType::register_type_object_representation() SequenceOctetPubSubType::SequenceOctetPubSubType() { - setName("SequenceOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceOctet::getMaxCdrSerializedSize()); -#else - SequenceOctet_max_cdr_typesize; -#endif + set_name("SequenceOctet"); + uint32_t type_size = SequenceOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceOctet_max_key_cdr_typesize > 16 ? SequenceOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceOctet_max_key_cdr_typesize > 16 ? SequenceOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceOctetPubSubType::~SequenceOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool SequenceOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool SequenceOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool SequenceOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool SequenceOctetPubSubType::deserialize( return true; } -std::function SequenceOctetPubSubType::getSerializedSizeProvider( +uint32_t SequenceOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceOctetPubSubType::create_data() { return reinterpret_cast(new SequenceOctet()); } -void SequenceOctetPubSubType::deleteData( +void SequenceOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceOctetPubSubType::getKey( +bool SequenceOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool SequenceOctetPubSubType::getKey( const SequenceOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceOctet_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 || SequenceOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void SequenceOctetPubSubType::register_type_object_representation() SequenceCharPubSubType::SequenceCharPubSubType() { - setName("SequenceChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceChar::getMaxCdrSerializedSize()); -#else - SequenceChar_max_cdr_typesize; -#endif + set_name("SequenceChar"); + uint32_t type_size = SequenceChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceChar_max_key_cdr_typesize > 16 ? SequenceChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceChar_max_key_cdr_typesize > 16 ? SequenceChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceCharPubSubType::~SequenceCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool SequenceCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool SequenceCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool SequenceCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool SequenceCharPubSubType::deserialize( return true; } -std::function SequenceCharPubSubType::getSerializedSizeProvider( +uint32_t SequenceCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceCharPubSubType::create_data() { return reinterpret_cast(new SequenceChar()); } -void SequenceCharPubSubType::deleteData( +void SequenceCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceCharPubSubType::getKey( +bool SequenceCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool SequenceCharPubSubType::getKey( const SequenceChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceChar_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 || SequenceChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void SequenceCharPubSubType::register_type_object_representation() SequenceWCharPubSubType::SequenceWCharPubSubType() { - setName("SequenceWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceWChar::getMaxCdrSerializedSize()); -#else - SequenceWChar_max_cdr_typesize; -#endif + set_name("SequenceWChar"); + uint32_t type_size = SequenceWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceWChar_max_key_cdr_typesize > 16 ? SequenceWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceWChar_max_key_cdr_typesize > 16 ? SequenceWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceWCharPubSubType::~SequenceWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool SequenceWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool SequenceWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool SequenceWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool SequenceWCharPubSubType::deserialize( return true; } -std::function SequenceWCharPubSubType::getSerializedSizeProvider( +uint32_t SequenceWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceWCharPubSubType::create_data() { return reinterpret_cast(new SequenceWChar()); } -void SequenceWCharPubSubType::deleteData( +void SequenceWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceWCharPubSubType::getKey( +bool SequenceWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool SequenceWCharPubSubType::getKey( const SequenceWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceWChar_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 || SequenceWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void SequenceWCharPubSubType::register_type_object_representation() SequenceStringPubSubType::SequenceStringPubSubType() { - setName("SequenceString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceString::getMaxCdrSerializedSize()); -#else - SequenceString_max_cdr_typesize; -#endif + set_name("SequenceString"); + uint32_t type_size = SequenceString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceString_max_key_cdr_typesize > 16 ? SequenceString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceString_max_key_cdr_typesize > 16 ? SequenceString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceStringPubSubType::~SequenceStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool SequenceStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool SequenceStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool SequenceStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool SequenceStringPubSubType::deserialize( return true; } -std::function SequenceStringPubSubType::getSerializedSizeProvider( +uint32_t SequenceStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceStringPubSubType::create_data() { return reinterpret_cast(new SequenceString()); } -void SequenceStringPubSubType::deleteData( +void SequenceStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceStringPubSubType::getKey( +bool SequenceStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool SequenceStringPubSubType::getKey( const SequenceString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceString_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 || SequenceString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void SequenceStringPubSubType::register_type_object_representation() SequenceWStringPubSubType::SequenceWStringPubSubType() { - setName("SequenceWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceWString::getMaxCdrSerializedSize()); -#else - SequenceWString_max_cdr_typesize; -#endif + set_name("SequenceWString"); + uint32_t type_size = SequenceWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceWString_max_key_cdr_typesize > 16 ? SequenceWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceWString_max_key_cdr_typesize > 16 ? SequenceWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceWStringPubSubType::~SequenceWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool SequenceWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool SequenceWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool SequenceWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool SequenceWStringPubSubType::deserialize( return true; } -std::function SequenceWStringPubSubType::getSerializedSizeProvider( +uint32_t SequenceWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceWStringPubSubType::create_data() { return reinterpret_cast(new SequenceWString()); } -void SequenceWStringPubSubType::deleteData( +void SequenceWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceWStringPubSubType::getKey( +bool SequenceWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool SequenceWStringPubSubType::getKey( const SequenceWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceWString_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 || SequenceWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void SequenceWStringPubSubType::register_type_object_representation() SequenceStringBoundedPubSubType::SequenceStringBoundedPubSubType() { - setName("SequenceStringBounded"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceStringBounded::getMaxCdrSerializedSize()); -#else - SequenceStringBounded_max_cdr_typesize; -#endif + set_name("SequenceStringBounded"); + uint32_t type_size = SequenceStringBounded_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceStringBounded_max_key_cdr_typesize > 16 ? SequenceStringBounded_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceStringBounded_max_key_cdr_typesize > 16 ? SequenceStringBounded_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceStringBoundedPubSubType::~SequenceStringBoundedPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool SequenceStringBoundedPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool SequenceStringBoundedPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool SequenceStringBoundedPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool SequenceStringBoundedPubSubType::deserialize( return true; } -std::function SequenceStringBoundedPubSubType::getSerializedSizeProvider( +uint32_t SequenceStringBoundedPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceStringBoundedPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceStringBoundedPubSubType::create_data() { return reinterpret_cast(new SequenceStringBounded()); } -void SequenceStringBoundedPubSubType::deleteData( +void SequenceStringBoundedPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceStringBoundedPubSubType::getKey( +bool SequenceStringBoundedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool SequenceStringBoundedPubSubType::getKey( const SequenceStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceStringBounded_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 || SequenceStringBounded_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void SequenceStringBoundedPubSubType::register_type_object_representation() SequenceWStringBoundedPubSubType::SequenceWStringBoundedPubSubType() { - setName("SequenceWStringBounded"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceWStringBounded::getMaxCdrSerializedSize()); -#else - SequenceWStringBounded_max_cdr_typesize; -#endif + set_name("SequenceWStringBounded"); + uint32_t type_size = SequenceWStringBounded_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceWStringBounded_max_key_cdr_typesize > 16 ? SequenceWStringBounded_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceWStringBounded_max_key_cdr_typesize > 16 ? SequenceWStringBounded_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceWStringBoundedPubSubType::~SequenceWStringBoundedPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool SequenceWStringBoundedPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool SequenceWStringBoundedPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool SequenceWStringBoundedPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool SequenceWStringBoundedPubSubType::deserialize( return true; } -std::function SequenceWStringBoundedPubSubType::getSerializedSizeProvider( +uint32_t SequenceWStringBoundedPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceWStringBoundedPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceWStringBoundedPubSubType::create_data() { return reinterpret_cast(new SequenceWStringBounded()); } -void SequenceWStringBoundedPubSubType::deleteData( +void SequenceWStringBoundedPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceWStringBoundedPubSubType::getKey( +bool SequenceWStringBoundedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool SequenceWStringBoundedPubSubType::getKey( const SequenceWStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceWStringBounded_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 || SequenceWStringBounded_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void SequenceWStringBoundedPubSubType::register_type_object_representation() SequenceEnumPubSubType::SequenceEnumPubSubType() { - setName("SequenceEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceEnum::getMaxCdrSerializedSize()); -#else - SequenceEnum_max_cdr_typesize; -#endif + set_name("SequenceEnum"); + uint32_t type_size = SequenceEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceEnum_max_key_cdr_typesize > 16 ? SequenceEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceEnum_max_key_cdr_typesize > 16 ? SequenceEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceEnumPubSubType::~SequenceEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool SequenceEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool SequenceEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool SequenceEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool SequenceEnumPubSubType::deserialize( return true; } -std::function SequenceEnumPubSubType::getSerializedSizeProvider( +uint32_t SequenceEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceEnumPubSubType::create_data() { return reinterpret_cast(new SequenceEnum()); } -void SequenceEnumPubSubType::deleteData( +void SequenceEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceEnumPubSubType::getKey( +bool SequenceEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool SequenceEnumPubSubType::getKey( const SequenceEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceEnum_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 || SequenceEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void SequenceEnumPubSubType::register_type_object_representation() SequenceBitMaskPubSubType::SequenceBitMaskPubSubType() { - setName("SequenceBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceBitMask::getMaxCdrSerializedSize()); -#else - SequenceBitMask_max_cdr_typesize; -#endif + set_name("SequenceBitMask"); + uint32_t type_size = SequenceBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceBitMask_max_key_cdr_typesize > 16 ? SequenceBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceBitMask_max_key_cdr_typesize > 16 ? SequenceBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceBitMaskPubSubType::~SequenceBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool SequenceBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool SequenceBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool SequenceBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool SequenceBitMaskPubSubType::deserialize( return true; } -std::function SequenceBitMaskPubSubType::getSerializedSizeProvider( +uint32_t SequenceBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceBitMaskPubSubType::create_data() { return reinterpret_cast(new SequenceBitMask()); } -void SequenceBitMaskPubSubType::deleteData( +void SequenceBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceBitMaskPubSubType::getKey( +bool SequenceBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool SequenceBitMaskPubSubType::getKey( const SequenceBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceBitMask_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 || SequenceBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void SequenceBitMaskPubSubType::register_type_object_representation() SequenceAliasPubSubType::SequenceAliasPubSubType() { - setName("SequenceAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceAlias::getMaxCdrSerializedSize()); -#else - SequenceAlias_max_cdr_typesize; -#endif + set_name("SequenceAlias"); + uint32_t type_size = SequenceAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceAlias_max_key_cdr_typesize > 16 ? SequenceAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceAlias_max_key_cdr_typesize > 16 ? SequenceAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceAliasPubSubType::~SequenceAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool SequenceAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool SequenceAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool SequenceAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool SequenceAliasPubSubType::deserialize( return true; } -std::function SequenceAliasPubSubType::getSerializedSizeProvider( +uint32_t SequenceAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceAliasPubSubType::create_data() { return reinterpret_cast(new SequenceAlias()); } -void SequenceAliasPubSubType::deleteData( +void SequenceAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceAliasPubSubType::getKey( +bool SequenceAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool SequenceAliasPubSubType::getKey( const SequenceAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceAlias_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 || SequenceAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void SequenceAliasPubSubType::register_type_object_representation() SequenceShortArrayPubSubType::SequenceShortArrayPubSubType() { - setName("SequenceShortArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceShortArray::getMaxCdrSerializedSize()); -#else - SequenceShortArray_max_cdr_typesize; -#endif + set_name("SequenceShortArray"); + uint32_t type_size = SequenceShortArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceShortArray_max_key_cdr_typesize > 16 ? SequenceShortArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceShortArray_max_key_cdr_typesize > 16 ? SequenceShortArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceShortArrayPubSubType::~SequenceShortArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool SequenceShortArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool SequenceShortArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool SequenceShortArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool SequenceShortArrayPubSubType::deserialize( return true; } -std::function SequenceShortArrayPubSubType::getSerializedSizeProvider( +uint32_t SequenceShortArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceShortArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceShortArrayPubSubType::create_data() { return reinterpret_cast(new SequenceShortArray()); } -void SequenceShortArrayPubSubType::deleteData( +void SequenceShortArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceShortArrayPubSubType::getKey( +bool SequenceShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool SequenceShortArrayPubSubType::getKey( const SequenceShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceShortArray_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 || SequenceShortArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void SequenceShortArrayPubSubType::register_type_object_representation() SequenceSequencePubSubType::SequenceSequencePubSubType() { - setName("SequenceSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceSequence::getMaxCdrSerializedSize()); -#else - SequenceSequence_max_cdr_typesize; -#endif + set_name("SequenceSequence"); + uint32_t type_size = SequenceSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceSequence_max_key_cdr_typesize > 16 ? SequenceSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceSequence_max_key_cdr_typesize > 16 ? SequenceSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceSequencePubSubType::~SequenceSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool SequenceSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool SequenceSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool SequenceSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool SequenceSequencePubSubType::deserialize( return true; } -std::function SequenceSequencePubSubType::getSerializedSizeProvider( +uint32_t SequenceSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceSequencePubSubType::create_data() { return reinterpret_cast(new SequenceSequence()); } -void SequenceSequencePubSubType::deleteData( +void SequenceSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceSequencePubSubType::getKey( +bool SequenceSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool SequenceSequencePubSubType::getKey( const SequenceSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceSequence_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 || SequenceSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void SequenceSequencePubSubType::register_type_object_representation() SequenceMapPubSubType::SequenceMapPubSubType() { - setName("SequenceMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceMap::getMaxCdrSerializedSize()); -#else - SequenceMap_max_cdr_typesize; -#endif + set_name("SequenceMap"); + uint32_t type_size = SequenceMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceMap_max_key_cdr_typesize > 16 ? SequenceMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceMap_max_key_cdr_typesize > 16 ? SequenceMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceMapPubSubType::~SequenceMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool SequenceMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool SequenceMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool SequenceMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool SequenceMapPubSubType::deserialize( return true; } -std::function SequenceMapPubSubType::getSerializedSizeProvider( +uint32_t SequenceMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceMapPubSubType::create_data() { return reinterpret_cast(new SequenceMap()); } -void SequenceMapPubSubType::deleteData( +void SequenceMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceMapPubSubType::getKey( +bool SequenceMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool SequenceMapPubSubType::getKey( const SequenceMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceMap_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 || SequenceMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void SequenceMapPubSubType::register_type_object_representation() SequenceUnionPubSubType::SequenceUnionPubSubType() { - setName("SequenceUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceUnion::getMaxCdrSerializedSize()); -#else - SequenceUnion_max_cdr_typesize; -#endif + set_name("SequenceUnion"); + uint32_t type_size = SequenceUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceUnion_max_key_cdr_typesize > 16 ? SequenceUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceUnion_max_key_cdr_typesize > 16 ? SequenceUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceUnionPubSubType::~SequenceUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool SequenceUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool SequenceUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool SequenceUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool SequenceUnionPubSubType::deserialize( return true; } -std::function SequenceUnionPubSubType::getSerializedSizeProvider( +uint32_t SequenceUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceUnionPubSubType::create_data() { return reinterpret_cast(new SequenceUnion()); } -void SequenceUnionPubSubType::deleteData( +void SequenceUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceUnionPubSubType::getKey( +bool SequenceUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool SequenceUnionPubSubType::getKey( const SequenceUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceUnion_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 || SequenceUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void SequenceUnionPubSubType::register_type_object_representation() SequenceStructurePubSubType::SequenceStructurePubSubType() { - setName("SequenceStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceStructure::getMaxCdrSerializedSize()); -#else - SequenceStructure_max_cdr_typesize; -#endif + set_name("SequenceStructure"); + uint32_t type_size = SequenceStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceStructure_max_key_cdr_typesize > 16 ? SequenceStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceStructure_max_key_cdr_typesize > 16 ? SequenceStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceStructurePubSubType::~SequenceStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool SequenceStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool SequenceStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool SequenceStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool SequenceStructurePubSubType::deserialize( return true; } -std::function SequenceStructurePubSubType::getSerializedSizeProvider( +uint32_t SequenceStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceStructurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceStructurePubSubType::create_data() { return reinterpret_cast(new SequenceStructure()); } -void SequenceStructurePubSubType::deleteData( +void SequenceStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceStructurePubSubType::getKey( +bool SequenceStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool SequenceStructurePubSubType::getKey( const SequenceStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceStructure_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 || SequenceStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void SequenceStructurePubSubType::register_type_object_representation() SequenceBitsetPubSubType::SequenceBitsetPubSubType() { - setName("SequenceBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceBitset::getMaxCdrSerializedSize()); -#else - SequenceBitset_max_cdr_typesize; -#endif + set_name("SequenceBitset"); + uint32_t type_size = SequenceBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceBitset_max_key_cdr_typesize > 16 ? SequenceBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceBitset_max_key_cdr_typesize > 16 ? SequenceBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceBitsetPubSubType::~SequenceBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool SequenceBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool SequenceBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool SequenceBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool SequenceBitsetPubSubType::deserialize( return true; } -std::function SequenceBitsetPubSubType::getSerializedSizeProvider( +uint32_t SequenceBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* SequenceBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* SequenceBitsetPubSubType::create_data() { return reinterpret_cast(new SequenceBitset()); } -void SequenceBitsetPubSubType::deleteData( +void SequenceBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceBitsetPubSubType::getKey( +bool SequenceBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool SequenceBitsetPubSubType::getKey( const SequenceBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceBitset_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 || SequenceBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void SequenceBitsetPubSubType::register_type_object_representation() BoundedSmallSequencesPubSubType::BoundedSmallSequencesPubSubType() { - setName("BoundedSmallSequences"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedSmallSequences::getMaxCdrSerializedSize()); -#else - BoundedSmallSequences_max_cdr_typesize; -#endif + set_name("BoundedSmallSequences"); + uint32_t type_size = BoundedSmallSequences_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedSmallSequences_max_key_cdr_typesize > 16 ? BoundedSmallSequences_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedSmallSequences_max_key_cdr_typesize > 16 ? BoundedSmallSequences_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedSmallSequencesPubSubType::~BoundedSmallSequencesPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool BoundedSmallSequencesPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool BoundedSmallSequencesPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool BoundedSmallSequencesPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool BoundedSmallSequencesPubSubType::deserialize( return true; } -std::function BoundedSmallSequencesPubSubType::getSerializedSizeProvider( +uint32_t BoundedSmallSequencesPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BoundedSmallSequencesPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BoundedSmallSequencesPubSubType::create_data() { return reinterpret_cast(new BoundedSmallSequences()); } -void BoundedSmallSequencesPubSubType::deleteData( +void BoundedSmallSequencesPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedSmallSequencesPubSubType::getKey( +bool BoundedSmallSequencesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool BoundedSmallSequencesPubSubType::getKey( const BoundedSmallSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedSmallSequences_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 || BoundedSmallSequences_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void BoundedSmallSequencesPubSubType::register_type_object_representation() BoundedBigSequencesPubSubType::BoundedBigSequencesPubSubType() { - setName("BoundedBigSequences"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BoundedBigSequences::getMaxCdrSerializedSize()); -#else - BoundedBigSequences_max_cdr_typesize; -#endif + set_name("BoundedBigSequences"); + uint32_t type_size = BoundedBigSequences_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BoundedBigSequences_max_key_cdr_typesize > 16 ? BoundedBigSequences_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BoundedBigSequences_max_key_cdr_typesize > 16 ? BoundedBigSequences_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BoundedBigSequencesPubSubType::~BoundedBigSequencesPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool BoundedBigSequencesPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool BoundedBigSequencesPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool BoundedBigSequencesPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool BoundedBigSequencesPubSubType::deserialize( return true; } -std::function BoundedBigSequencesPubSubType::getSerializedSizeProvider( +uint32_t BoundedBigSequencesPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* BoundedBigSequencesPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* BoundedBigSequencesPubSubType::create_data() { return reinterpret_cast(new BoundedBigSequences()); } -void BoundedBigSequencesPubSubType::deleteData( +void BoundedBigSequencesPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BoundedBigSequencesPubSubType::getKey( +bool BoundedBigSequencesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool BoundedBigSequencesPubSubType::getKey( const BoundedBigSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BoundedBigSequences_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 || BoundedBigSequences_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index e833d1bcad4..3631cb4f966 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -62,18 +62,18 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/stringsPubSubTypes.cxx b/test/dds-types-test/stringsPubSubTypes.cxx index 5413c56d906..a33a4f7eda5 100644 --- a/test/dds-types-test/stringsPubSubTypes.cxx +++ b/test/dds-types-test/stringsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StringStructPubSubType::StringStructPubSubType() { - setName("StringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StringStruct::getMaxCdrSerializedSize()); -#else - StringStruct_max_cdr_typesize; -#endif + set_name("StringStruct"); + uint32_t type_size = StringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StringStruct_max_key_cdr_typesize > 16 ? StringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StringStruct_max_key_cdr_typesize > 16 ? StringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StringStructPubSubType::~StringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool StringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool StringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool StringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool StringStructPubSubType::deserialize( return true; } -std::function StringStructPubSubType::getSerializedSizeProvider( +uint32_t StringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* StringStructPubSubType::createData() +void* StringStructPubSubType::create_data() { return reinterpret_cast(new StringStruct()); } -void StringStructPubSubType::deleteData( +void StringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StringStructPubSubType::getKey( +bool StringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool StringStructPubSubType::getKey( const StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StringStruct_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 || StringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void StringStructPubSubType::register_type_object_representation() WStringStructPubSubType::WStringStructPubSubType() { - setName("WStringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(WStringStruct::getMaxCdrSerializedSize()); -#else - WStringStruct_max_cdr_typesize; -#endif + set_name("WStringStruct"); + uint32_t type_size = WStringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = WStringStruct_max_key_cdr_typesize > 16 ? WStringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = WStringStruct_max_key_cdr_typesize > 16 ? WStringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } WStringStructPubSubType::~WStringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool WStringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool WStringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool WStringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool WStringStructPubSubType::deserialize( return true; } -std::function WStringStructPubSubType::getSerializedSizeProvider( +uint32_t WStringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* WStringStructPubSubType::createData() +void* WStringStructPubSubType::create_data() { return reinterpret_cast(new WStringStruct()); } -void WStringStructPubSubType::deleteData( +void WStringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool WStringStructPubSubType::getKey( +bool WStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool WStringStructPubSubType::getKey( const WStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), WStringStruct_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 || WStringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void WStringStructPubSubType::register_type_object_representation() SmallStringStructPubSubType::SmallStringStructPubSubType() { - setName("SmallStringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SmallStringStruct::getMaxCdrSerializedSize()); -#else - SmallStringStruct_max_cdr_typesize; -#endif + set_name("SmallStringStruct"); + uint32_t type_size = SmallStringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SmallStringStruct_max_key_cdr_typesize > 16 ? SmallStringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SmallStringStruct_max_key_cdr_typesize > 16 ? SmallStringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SmallStringStructPubSubType::~SmallStringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool SmallStringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool SmallStringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool SmallStringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool SmallStringStructPubSubType::deserialize( return true; } -std::function SmallStringStructPubSubType::getSerializedSizeProvider( +uint32_t SmallStringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* SmallStringStructPubSubType::createData() +void* SmallStringStructPubSubType::create_data() { return reinterpret_cast(new SmallStringStruct()); } -void SmallStringStructPubSubType::deleteData( +void SmallStringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SmallStringStructPubSubType::getKey( +bool SmallStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool SmallStringStructPubSubType::getKey( const SmallStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SmallStringStruct_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 || SmallStringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void SmallStringStructPubSubType::register_type_object_representation() SmallWStringStructPubSubType::SmallWStringStructPubSubType() { - setName("SmallWStringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SmallWStringStruct::getMaxCdrSerializedSize()); -#else - SmallWStringStruct_max_cdr_typesize; -#endif + set_name("SmallWStringStruct"); + uint32_t type_size = SmallWStringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SmallWStringStruct_max_key_cdr_typesize > 16 ? SmallWStringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SmallWStringStruct_max_key_cdr_typesize > 16 ? SmallWStringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SmallWStringStructPubSubType::~SmallWStringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool SmallWStringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool SmallWStringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool SmallWStringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool SmallWStringStructPubSubType::deserialize( return true; } -std::function SmallWStringStructPubSubType::getSerializedSizeProvider( +uint32_t SmallWStringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* SmallWStringStructPubSubType::createData() +void* SmallWStringStructPubSubType::create_data() { return reinterpret_cast(new SmallWStringStruct()); } -void SmallWStringStructPubSubType::deleteData( +void SmallWStringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SmallWStringStructPubSubType::getKey( +bool SmallWStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool SmallWStringStructPubSubType::getKey( const SmallWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SmallWStringStruct_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 || SmallWStringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void SmallWStringStructPubSubType::register_type_object_representation() LargeStringStructPubSubType::LargeStringStructPubSubType() { - setName("LargeStringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LargeStringStruct::getMaxCdrSerializedSize()); -#else - LargeStringStruct_max_cdr_typesize; -#endif + set_name("LargeStringStruct"); + uint32_t type_size = LargeStringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LargeStringStruct_max_key_cdr_typesize > 16 ? LargeStringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LargeStringStruct_max_key_cdr_typesize > 16 ? LargeStringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LargeStringStructPubSubType::~LargeStringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool LargeStringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool LargeStringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool LargeStringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool LargeStringStructPubSubType::deserialize( return true; } -std::function LargeStringStructPubSubType::getSerializedSizeProvider( +uint32_t LargeStringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* LargeStringStructPubSubType::createData() +void* LargeStringStructPubSubType::create_data() { return reinterpret_cast(new LargeStringStruct()); } -void LargeStringStructPubSubType::deleteData( +void LargeStringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LargeStringStructPubSubType::getKey( +bool LargeStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool LargeStringStructPubSubType::getKey( const LargeStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LargeStringStruct_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 || LargeStringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void LargeStringStructPubSubType::register_type_object_representation() LargeWStringStructPubSubType::LargeWStringStructPubSubType() { - setName("LargeWStringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(LargeWStringStruct::getMaxCdrSerializedSize()); -#else - LargeWStringStruct_max_cdr_typesize; -#endif + set_name("LargeWStringStruct"); + uint32_t type_size = LargeWStringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = LargeWStringStruct_max_key_cdr_typesize > 16 ? LargeWStringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = LargeWStringStruct_max_key_cdr_typesize > 16 ? LargeWStringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } LargeWStringStructPubSubType::~LargeWStringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool LargeWStringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool LargeWStringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool LargeWStringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool LargeWStringStructPubSubType::deserialize( return true; } -std::function LargeWStringStructPubSubType::getSerializedSizeProvider( +uint32_t LargeWStringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* LargeWStringStructPubSubType::createData() +void* LargeWStringStructPubSubType::create_data() { return reinterpret_cast(new LargeWStringStruct()); } -void LargeWStringStructPubSubType::deleteData( +void LargeWStringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool LargeWStringStructPubSubType::getKey( +bool LargeWStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool LargeWStringStructPubSubType::getKey( const LargeWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), LargeWStringStruct_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 || LargeWStringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index 9eaecbd6088..1b7c048107a 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -61,18 +61,18 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -135,18 +135,18 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -181,8 +181,8 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -209,18 +209,18 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -255,8 +255,8 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -283,18 +283,18 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -329,8 +329,8 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -357,18 +357,18 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -403,8 +403,8 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -431,18 +431,18 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -477,8 +477,8 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/structuresPubSubTypes.cxx b/test/dds-types-test/structuresPubSubTypes.cxx index 73fb45440ad..74714ed61e5 100644 --- a/test/dds-types-test/structuresPubSubTypes.cxx +++ b/test/dds-types-test/structuresPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StructShortPubSubType::StructShortPubSubType() { - setName("StructShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructShort::getMaxCdrSerializedSize()); -#else - StructShort_max_cdr_typesize; -#endif + set_name("StructShort"); + uint32_t type_size = StructShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructShort_max_key_cdr_typesize > 16 ? StructShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructShort_max_key_cdr_typesize > 16 ? StructShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructShortPubSubType::~StructShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool StructShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool StructShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool StructShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool StructShortPubSubType::deserialize( return true; } -std::function StructShortPubSubType::getSerializedSizeProvider( +uint32_t StructShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructShortPubSubType::create_data() { return reinterpret_cast(new StructShort()); } -void StructShortPubSubType::deleteData( +void StructShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructShortPubSubType::getKey( +bool StructShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool StructShortPubSubType::getKey( const StructShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructShort_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 || StructShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void StructShortPubSubType::register_type_object_representation() StructUnsignedShortPubSubType::StructUnsignedShortPubSubType() { - setName("StructUnsignedShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructUnsignedShort::getMaxCdrSerializedSize()); -#else - StructUnsignedShort_max_cdr_typesize; -#endif + set_name("StructUnsignedShort"); + uint32_t type_size = StructUnsignedShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructUnsignedShort_max_key_cdr_typesize > 16 ? StructUnsignedShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructUnsignedShort_max_key_cdr_typesize > 16 ? StructUnsignedShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructUnsignedShortPubSubType::~StructUnsignedShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool StructUnsignedShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool StructUnsignedShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool StructUnsignedShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool StructUnsignedShortPubSubType::deserialize( return true; } -std::function StructUnsignedShortPubSubType::getSerializedSizeProvider( +uint32_t StructUnsignedShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructUnsignedShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructUnsignedShortPubSubType::create_data() { return reinterpret_cast(new StructUnsignedShort()); } -void StructUnsignedShortPubSubType::deleteData( +void StructUnsignedShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructUnsignedShortPubSubType::getKey( +bool StructUnsignedShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool StructUnsignedShortPubSubType::getKey( const StructUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructUnsignedShort_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 || StructUnsignedShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void StructUnsignedShortPubSubType::register_type_object_representation() StructLongPubSubType::StructLongPubSubType() { - setName("StructLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructLong::getMaxCdrSerializedSize()); -#else - StructLong_max_cdr_typesize; -#endif + set_name("StructLong"); + uint32_t type_size = StructLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructLong_max_key_cdr_typesize > 16 ? StructLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructLong_max_key_cdr_typesize > 16 ? StructLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructLongPubSubType::~StructLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool StructLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool StructLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool StructLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool StructLongPubSubType::deserialize( return true; } -std::function StructLongPubSubType::getSerializedSizeProvider( +uint32_t StructLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructLongPubSubType::create_data() { return reinterpret_cast(new StructLong()); } -void StructLongPubSubType::deleteData( +void StructLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructLongPubSubType::getKey( +bool StructLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool StructLongPubSubType::getKey( const StructLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructLong_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 || StructLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void StructLongPubSubType::register_type_object_representation() StructUnsignedLongPubSubType::StructUnsignedLongPubSubType() { - setName("StructUnsignedLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructUnsignedLong::getMaxCdrSerializedSize()); -#else - StructUnsignedLong_max_cdr_typesize; -#endif + set_name("StructUnsignedLong"); + uint32_t type_size = StructUnsignedLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructUnsignedLong_max_key_cdr_typesize > 16 ? StructUnsignedLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructUnsignedLong_max_key_cdr_typesize > 16 ? StructUnsignedLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructUnsignedLongPubSubType::~StructUnsignedLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool StructUnsignedLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool StructUnsignedLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool StructUnsignedLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool StructUnsignedLongPubSubType::deserialize( return true; } -std::function StructUnsignedLongPubSubType::getSerializedSizeProvider( +uint32_t StructUnsignedLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructUnsignedLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructUnsignedLongPubSubType::create_data() { return reinterpret_cast(new StructUnsignedLong()); } -void StructUnsignedLongPubSubType::deleteData( +void StructUnsignedLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructUnsignedLongPubSubType::getKey( +bool StructUnsignedLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool StructUnsignedLongPubSubType::getKey( const StructUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructUnsignedLong_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 || StructUnsignedLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void StructUnsignedLongPubSubType::register_type_object_representation() StructLongLongPubSubType::StructLongLongPubSubType() { - setName("StructLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructLongLong::getMaxCdrSerializedSize()); -#else - StructLongLong_max_cdr_typesize; -#endif + set_name("StructLongLong"); + uint32_t type_size = StructLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructLongLong_max_key_cdr_typesize > 16 ? StructLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructLongLong_max_key_cdr_typesize > 16 ? StructLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructLongLongPubSubType::~StructLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool StructLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool StructLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool StructLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool StructLongLongPubSubType::deserialize( return true; } -std::function StructLongLongPubSubType::getSerializedSizeProvider( +uint32_t StructLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructLongLongPubSubType::create_data() { return reinterpret_cast(new StructLongLong()); } -void StructLongLongPubSubType::deleteData( +void StructLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructLongLongPubSubType::getKey( +bool StructLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool StructLongLongPubSubType::getKey( const StructLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructLongLong_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 || StructLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void StructLongLongPubSubType::register_type_object_representation() StructUnsignedLongLongPubSubType::StructUnsignedLongLongPubSubType() { - setName("StructUnsignedLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructUnsignedLongLong::getMaxCdrSerializedSize()); -#else - StructUnsignedLongLong_max_cdr_typesize; -#endif + set_name("StructUnsignedLongLong"); + uint32_t type_size = StructUnsignedLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructUnsignedLongLong_max_key_cdr_typesize > 16 ? StructUnsignedLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructUnsignedLongLong_max_key_cdr_typesize > 16 ? StructUnsignedLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructUnsignedLongLongPubSubType::~StructUnsignedLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool StructUnsignedLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool StructUnsignedLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool StructUnsignedLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool StructUnsignedLongLongPubSubType::deserialize( return true; } -std::function StructUnsignedLongLongPubSubType::getSerializedSizeProvider( +uint32_t StructUnsignedLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructUnsignedLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructUnsignedLongLongPubSubType::create_data() { return reinterpret_cast(new StructUnsignedLongLong()); } -void StructUnsignedLongLongPubSubType::deleteData( +void StructUnsignedLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructUnsignedLongLongPubSubType::getKey( +bool StructUnsignedLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool StructUnsignedLongLongPubSubType::getKey( const StructUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructUnsignedLongLong_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 || StructUnsignedLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void StructUnsignedLongLongPubSubType::register_type_object_representation() StructFloatPubSubType::StructFloatPubSubType() { - setName("StructFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructFloat::getMaxCdrSerializedSize()); -#else - StructFloat_max_cdr_typesize; -#endif + set_name("StructFloat"); + uint32_t type_size = StructFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructFloat_max_key_cdr_typesize > 16 ? StructFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructFloat_max_key_cdr_typesize > 16 ? StructFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructFloatPubSubType::~StructFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool StructFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool StructFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool StructFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool StructFloatPubSubType::deserialize( return true; } -std::function StructFloatPubSubType::getSerializedSizeProvider( +uint32_t StructFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructFloatPubSubType::create_data() { return reinterpret_cast(new StructFloat()); } -void StructFloatPubSubType::deleteData( +void StructFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructFloatPubSubType::getKey( +bool StructFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool StructFloatPubSubType::getKey( const StructFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructFloat_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 || StructFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void StructFloatPubSubType::register_type_object_representation() StructDoublePubSubType::StructDoublePubSubType() { - setName("StructDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructDouble::getMaxCdrSerializedSize()); -#else - StructDouble_max_cdr_typesize; -#endif + set_name("StructDouble"); + uint32_t type_size = StructDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructDouble_max_key_cdr_typesize > 16 ? StructDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructDouble_max_key_cdr_typesize > 16 ? StructDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructDoublePubSubType::~StructDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool StructDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool StructDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool StructDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool StructDoublePubSubType::deserialize( return true; } -std::function StructDoublePubSubType::getSerializedSizeProvider( +uint32_t StructDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructDoublePubSubType::create_data() { return reinterpret_cast(new StructDouble()); } -void StructDoublePubSubType::deleteData( +void StructDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructDoublePubSubType::getKey( +bool StructDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool StructDoublePubSubType::getKey( const StructDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructDouble_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 || StructDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void StructDoublePubSubType::register_type_object_representation() StructLongDoublePubSubType::StructLongDoublePubSubType() { - setName("StructLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructLongDouble::getMaxCdrSerializedSize()); -#else - StructLongDouble_max_cdr_typesize; -#endif + set_name("StructLongDouble"); + uint32_t type_size = StructLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructLongDouble_max_key_cdr_typesize > 16 ? StructLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructLongDouble_max_key_cdr_typesize > 16 ? StructLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructLongDoublePubSubType::~StructLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool StructLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool StructLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool StructLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool StructLongDoublePubSubType::deserialize( return true; } -std::function StructLongDoublePubSubType::getSerializedSizeProvider( +uint32_t StructLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructLongDoublePubSubType::create_data() { return reinterpret_cast(new StructLongDouble()); } -void StructLongDoublePubSubType::deleteData( +void StructLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructLongDoublePubSubType::getKey( +bool StructLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool StructLongDoublePubSubType::getKey( const StructLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructLongDouble_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 || StructLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void StructLongDoublePubSubType::register_type_object_representation() StructBooleanPubSubType::StructBooleanPubSubType() { - setName("StructBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructBoolean::getMaxCdrSerializedSize()); -#else - StructBoolean_max_cdr_typesize; -#endif + set_name("StructBoolean"); + uint32_t type_size = StructBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructBoolean_max_key_cdr_typesize > 16 ? StructBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructBoolean_max_key_cdr_typesize > 16 ? StructBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructBooleanPubSubType::~StructBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool StructBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool StructBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool StructBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool StructBooleanPubSubType::deserialize( return true; } -std::function StructBooleanPubSubType::getSerializedSizeProvider( +uint32_t StructBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructBooleanPubSubType::create_data() { return reinterpret_cast(new StructBoolean()); } -void StructBooleanPubSubType::deleteData( +void StructBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructBooleanPubSubType::getKey( +bool StructBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool StructBooleanPubSubType::getKey( const StructBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructBoolean_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 || StructBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void StructBooleanPubSubType::register_type_object_representation() StructOctetPubSubType::StructOctetPubSubType() { - setName("StructOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructOctet::getMaxCdrSerializedSize()); -#else - StructOctet_max_cdr_typesize; -#endif + set_name("StructOctet"); + uint32_t type_size = StructOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructOctet_max_key_cdr_typesize > 16 ? StructOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructOctet_max_key_cdr_typesize > 16 ? StructOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructOctetPubSubType::~StructOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool StructOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool StructOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool StructOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool StructOctetPubSubType::deserialize( return true; } -std::function StructOctetPubSubType::getSerializedSizeProvider( +uint32_t StructOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructOctetPubSubType::create_data() { return reinterpret_cast(new StructOctet()); } -void StructOctetPubSubType::deleteData( +void StructOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructOctetPubSubType::getKey( +bool StructOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool StructOctetPubSubType::getKey( const StructOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructOctet_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 || StructOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void StructOctetPubSubType::register_type_object_representation() StructChar8PubSubType::StructChar8PubSubType() { - setName("StructChar8"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructChar8::getMaxCdrSerializedSize()); -#else - StructChar8_max_cdr_typesize; -#endif + set_name("StructChar8"); + uint32_t type_size = StructChar8_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructChar8_max_key_cdr_typesize > 16 ? StructChar8_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructChar8_max_key_cdr_typesize > 16 ? StructChar8_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructChar8PubSubType::~StructChar8PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool StructChar8PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool StructChar8PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool StructChar8PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool StructChar8PubSubType::deserialize( return true; } -std::function StructChar8PubSubType::getSerializedSizeProvider( +uint32_t StructChar8PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructChar8PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructChar8PubSubType::create_data() { return reinterpret_cast(new StructChar8()); } -void StructChar8PubSubType::deleteData( +void StructChar8PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructChar8PubSubType::getKey( +bool StructChar8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool StructChar8PubSubType::getKey( const StructChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructChar8_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 || StructChar8_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void StructChar8PubSubType::register_type_object_representation() StructChar16PubSubType::StructChar16PubSubType() { - setName("StructChar16"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructChar16::getMaxCdrSerializedSize()); -#else - StructChar16_max_cdr_typesize; -#endif + set_name("StructChar16"); + uint32_t type_size = StructChar16_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructChar16_max_key_cdr_typesize > 16 ? StructChar16_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructChar16_max_key_cdr_typesize > 16 ? StructChar16_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructChar16PubSubType::~StructChar16PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool StructChar16PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool StructChar16PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool StructChar16PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool StructChar16PubSubType::deserialize( return true; } -std::function StructChar16PubSubType::getSerializedSizeProvider( +uint32_t StructChar16PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructChar16PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructChar16PubSubType::create_data() { return reinterpret_cast(new StructChar16()); } -void StructChar16PubSubType::deleteData( +void StructChar16PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructChar16PubSubType::getKey( +bool StructChar16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool StructChar16PubSubType::getKey( const StructChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructChar16_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 || StructChar16_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void StructChar16PubSubType::register_type_object_representation() StructStringPubSubType::StructStringPubSubType() { - setName("StructString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructString::getMaxCdrSerializedSize()); -#else - StructString_max_cdr_typesize; -#endif + set_name("StructString"); + uint32_t type_size = StructString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructString_max_key_cdr_typesize > 16 ? StructString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructString_max_key_cdr_typesize > 16 ? StructString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructStringPubSubType::~StructStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool StructStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool StructStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool StructStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool StructStringPubSubType::deserialize( return true; } -std::function StructStringPubSubType::getSerializedSizeProvider( +uint32_t StructStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructStringPubSubType::create_data() { return reinterpret_cast(new StructString()); } -void StructStringPubSubType::deleteData( +void StructStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructStringPubSubType::getKey( +bool StructStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool StructStringPubSubType::getKey( const StructString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructString_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 || StructString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void StructStringPubSubType::register_type_object_representation() StructWStringPubSubType::StructWStringPubSubType() { - setName("StructWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructWString::getMaxCdrSerializedSize()); -#else - StructWString_max_cdr_typesize; -#endif + set_name("StructWString"); + uint32_t type_size = StructWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructWString_max_key_cdr_typesize > 16 ? StructWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructWString_max_key_cdr_typesize > 16 ? StructWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructWStringPubSubType::~StructWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool StructWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool StructWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool StructWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool StructWStringPubSubType::deserialize( return true; } -std::function StructWStringPubSubType::getSerializedSizeProvider( +uint32_t StructWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructWStringPubSubType::create_data() { return reinterpret_cast(new StructWString()); } -void StructWStringPubSubType::deleteData( +void StructWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructWStringPubSubType::getKey( +bool StructWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool StructWStringPubSubType::getKey( const StructWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructWString_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 || StructWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void StructWStringPubSubType::register_type_object_representation() StructBoundedStringPubSubType::StructBoundedStringPubSubType() { - setName("StructBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructBoundedString::getMaxCdrSerializedSize()); -#else - StructBoundedString_max_cdr_typesize; -#endif + set_name("StructBoundedString"); + uint32_t type_size = StructBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructBoundedString_max_key_cdr_typesize > 16 ? StructBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructBoundedString_max_key_cdr_typesize > 16 ? StructBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructBoundedStringPubSubType::~StructBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool StructBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool StructBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool StructBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool StructBoundedStringPubSubType::deserialize( return true; } -std::function StructBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t StructBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructBoundedStringPubSubType::create_data() { return reinterpret_cast(new StructBoundedString()); } -void StructBoundedStringPubSubType::deleteData( +void StructBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructBoundedStringPubSubType::getKey( +bool StructBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool StructBoundedStringPubSubType::getKey( const StructBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructBoundedString_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 || StructBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void StructBoundedStringPubSubType::register_type_object_representation() StructBoundedWStringPubSubType::StructBoundedWStringPubSubType() { - setName("StructBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructBoundedWString::getMaxCdrSerializedSize()); -#else - StructBoundedWString_max_cdr_typesize; -#endif + set_name("StructBoundedWString"); + uint32_t type_size = StructBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructBoundedWString_max_key_cdr_typesize > 16 ? StructBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructBoundedWString_max_key_cdr_typesize > 16 ? StructBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructBoundedWStringPubSubType::~StructBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool StructBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool StructBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool StructBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool StructBoundedWStringPubSubType::deserialize( return true; } -std::function StructBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t StructBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructBoundedWStringPubSubType::create_data() { return reinterpret_cast(new StructBoundedWString()); } -void StructBoundedWStringPubSubType::deleteData( +void StructBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructBoundedWStringPubSubType::getKey( +bool StructBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool StructBoundedWStringPubSubType::getKey( const StructBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructBoundedWString_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 || StructBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void StructBoundedWStringPubSubType::register_type_object_representation() StructEnumPubSubType::StructEnumPubSubType() { - setName("StructEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructEnum::getMaxCdrSerializedSize()); -#else - StructEnum_max_cdr_typesize; -#endif + set_name("StructEnum"); + uint32_t type_size = StructEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructEnum_max_key_cdr_typesize > 16 ? StructEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructEnum_max_key_cdr_typesize > 16 ? StructEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructEnumPubSubType::~StructEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool StructEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool StructEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool StructEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool StructEnumPubSubType::deserialize( return true; } -std::function StructEnumPubSubType::getSerializedSizeProvider( +uint32_t StructEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructEnumPubSubType::create_data() { return reinterpret_cast(new StructEnum()); } -void StructEnumPubSubType::deleteData( +void StructEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructEnumPubSubType::getKey( +bool StructEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool StructEnumPubSubType::getKey( const StructEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructEnum_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 || StructEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void StructEnumPubSubType::register_type_object_representation() StructBitMaskPubSubType::StructBitMaskPubSubType() { - setName("StructBitMask"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructBitMask::getMaxCdrSerializedSize()); -#else - StructBitMask_max_cdr_typesize; -#endif + set_name("StructBitMask"); + uint32_t type_size = StructBitMask_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructBitMask_max_key_cdr_typesize > 16 ? StructBitMask_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructBitMask_max_key_cdr_typesize > 16 ? StructBitMask_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructBitMaskPubSubType::~StructBitMaskPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool StructBitMaskPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool StructBitMaskPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool StructBitMaskPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool StructBitMaskPubSubType::deserialize( return true; } -std::function StructBitMaskPubSubType::getSerializedSizeProvider( +uint32_t StructBitMaskPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructBitMaskPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructBitMaskPubSubType::create_data() { return reinterpret_cast(new StructBitMask()); } -void StructBitMaskPubSubType::deleteData( +void StructBitMaskPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructBitMaskPubSubType::getKey( +bool StructBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool StructBitMaskPubSubType::getKey( const StructBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructBitMask_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 || StructBitMask_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void StructBitMaskPubSubType::register_type_object_representation() StructAliasPubSubType::StructAliasPubSubType() { - setName("StructAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructAlias::getMaxCdrSerializedSize()); -#else - StructAlias_max_cdr_typesize; -#endif + set_name("StructAlias"); + uint32_t type_size = StructAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructAlias_max_key_cdr_typesize > 16 ? StructAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructAlias_max_key_cdr_typesize > 16 ? StructAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructAliasPubSubType::~StructAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool StructAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool StructAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool StructAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool StructAliasPubSubType::deserialize( return true; } -std::function StructAliasPubSubType::getSerializedSizeProvider( +uint32_t StructAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructAliasPubSubType::create_data() { return reinterpret_cast(new StructAlias()); } -void StructAliasPubSubType::deleteData( +void StructAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructAliasPubSubType::getKey( +bool StructAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool StructAliasPubSubType::getKey( const StructAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructAlias_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 || StructAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void StructAliasPubSubType::register_type_object_representation() StructShortArrayPubSubType::StructShortArrayPubSubType() { - setName("StructShortArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructShortArray::getMaxCdrSerializedSize()); -#else - StructShortArray_max_cdr_typesize; -#endif + set_name("StructShortArray"); + uint32_t type_size = StructShortArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructShortArray_max_key_cdr_typesize > 16 ? StructShortArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructShortArray_max_key_cdr_typesize > 16 ? StructShortArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructShortArrayPubSubType::~StructShortArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool StructShortArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool StructShortArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool StructShortArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool StructShortArrayPubSubType::deserialize( return true; } -std::function StructShortArrayPubSubType::getSerializedSizeProvider( +uint32_t StructShortArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructShortArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructShortArrayPubSubType::create_data() { return reinterpret_cast(new StructShortArray()); } -void StructShortArrayPubSubType::deleteData( +void StructShortArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructShortArrayPubSubType::getKey( +bool StructShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool StructShortArrayPubSubType::getKey( const StructShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructShortArray_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 || StructShortArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void StructShortArrayPubSubType::register_type_object_representation() StructSequencePubSubType::StructSequencePubSubType() { - setName("StructSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructSequence::getMaxCdrSerializedSize()); -#else - StructSequence_max_cdr_typesize; -#endif + set_name("StructSequence"); + uint32_t type_size = StructSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructSequence_max_key_cdr_typesize > 16 ? StructSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructSequence_max_key_cdr_typesize > 16 ? StructSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructSequencePubSubType::~StructSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool StructSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool StructSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool StructSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool StructSequencePubSubType::deserialize( return true; } -std::function StructSequencePubSubType::getSerializedSizeProvider( +uint32_t StructSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructSequencePubSubType::create_data() { return reinterpret_cast(new StructSequence()); } -void StructSequencePubSubType::deleteData( +void StructSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructSequencePubSubType::getKey( +bool StructSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool StructSequencePubSubType::getKey( const StructSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructSequence_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 || StructSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void StructSequencePubSubType::register_type_object_representation() StructMapPubSubType::StructMapPubSubType() { - setName("StructMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructMap::getMaxCdrSerializedSize()); -#else - StructMap_max_cdr_typesize; -#endif + set_name("StructMap"); + uint32_t type_size = StructMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructMap_max_key_cdr_typesize > 16 ? StructMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructMap_max_key_cdr_typesize > 16 ? StructMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructMapPubSubType::~StructMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool StructMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool StructMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool StructMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool StructMapPubSubType::deserialize( return true; } -std::function StructMapPubSubType::getSerializedSizeProvider( +uint32_t StructMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructMapPubSubType::create_data() { return reinterpret_cast(new StructMap()); } -void StructMapPubSubType::deleteData( +void StructMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructMapPubSubType::getKey( +bool StructMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool StructMapPubSubType::getKey( const StructMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructMap_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 || StructMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void StructMapPubSubType::register_type_object_representation() StructUnionPubSubType::StructUnionPubSubType() { - setName("StructUnion"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructUnion::getMaxCdrSerializedSize()); -#else - StructUnion_max_cdr_typesize; -#endif + set_name("StructUnion"); + uint32_t type_size = StructUnion_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructUnion_max_key_cdr_typesize > 16 ? StructUnion_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructUnion_max_key_cdr_typesize > 16 ? StructUnion_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructUnionPubSubType::~StructUnionPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool StructUnionPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool StructUnionPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool StructUnionPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool StructUnionPubSubType::deserialize( return true; } -std::function StructUnionPubSubType::getSerializedSizeProvider( +uint32_t StructUnionPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructUnionPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructUnionPubSubType::create_data() { return reinterpret_cast(new StructUnion()); } -void StructUnionPubSubType::deleteData( +void StructUnionPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructUnionPubSubType::getKey( +bool StructUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool StructUnionPubSubType::getKey( const StructUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructUnion_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 || StructUnion_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void StructUnionPubSubType::register_type_object_representation() StructStructurePubSubType::StructStructurePubSubType() { - setName("StructStructure"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructStructure::getMaxCdrSerializedSize()); -#else - StructStructure_max_cdr_typesize; -#endif + set_name("StructStructure"); + uint32_t type_size = StructStructure_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructStructure_max_key_cdr_typesize > 16 ? StructStructure_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructStructure_max_key_cdr_typesize > 16 ? StructStructure_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructStructurePubSubType::~StructStructurePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool StructStructurePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool StructStructurePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool StructStructurePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool StructStructurePubSubType::deserialize( return true; } -std::function StructStructurePubSubType::getSerializedSizeProvider( +uint32_t StructStructurePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructStructurePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructStructurePubSubType::create_data() { return reinterpret_cast(new StructStructure()); } -void StructStructurePubSubType::deleteData( +void StructStructurePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructStructurePubSubType::getKey( +bool StructStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool StructStructurePubSubType::getKey( const StructStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructStructure_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 || StructStructure_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void StructStructurePubSubType::register_type_object_representation() StructBitsetPubSubType::StructBitsetPubSubType() { - setName("StructBitset"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructBitset::getMaxCdrSerializedSize()); -#else - StructBitset_max_cdr_typesize; -#endif + set_name("StructBitset"); + uint32_t type_size = StructBitset_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructBitset_max_key_cdr_typesize > 16 ? StructBitset_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructBitset_max_key_cdr_typesize > 16 ? StructBitset_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructBitsetPubSubType::~StructBitsetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool StructBitsetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool StructBitsetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool StructBitsetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool StructBitsetPubSubType::deserialize( return true; } -std::function StructBitsetPubSubType::getSerializedSizeProvider( +uint32_t StructBitsetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructBitsetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructBitsetPubSubType::create_data() { return reinterpret_cast(new StructBitset()); } -void StructBitsetPubSubType::deleteData( +void StructBitsetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructBitsetPubSubType::getKey( +bool StructBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool StructBitsetPubSubType::getKey( const StructBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructBitset_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 || StructBitset_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void StructBitsetPubSubType::register_type_object_representation() StructEmptyPubSubType::StructEmptyPubSubType() { - setName("StructEmpty"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructEmpty::getMaxCdrSerializedSize()); -#else - StructEmpty_max_cdr_typesize; -#endif + set_name("StructEmpty"); + uint32_t type_size = StructEmpty_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructEmpty_max_key_cdr_typesize > 16 ? StructEmpty_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructEmpty_max_key_cdr_typesize > 16 ? StructEmpty_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructEmptyPubSubType::~StructEmptyPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool StructEmptyPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool StructEmptyPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool StructEmptyPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool StructEmptyPubSubType::deserialize( return true; } -std::function StructEmptyPubSubType::getSerializedSizeProvider( +uint32_t StructEmptyPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructEmptyPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructEmptyPubSubType::create_data() { return reinterpret_cast(new StructEmpty()); } -void StructEmptyPubSubType::deleteData( +void StructEmptyPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructEmptyPubSubType::getKey( +bool StructEmptyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool StructEmptyPubSubType::getKey( const StructEmpty* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructEmpty_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 || StructEmpty_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void StructEmptyPubSubType::register_type_object_representation() StructuresPubSubType::StructuresPubSubType() { - setName("Structures"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(Structures::getMaxCdrSerializedSize()); -#else - Structures_max_cdr_typesize; -#endif + set_name("Structures"); + uint32_t type_size = Structures_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = Structures_max_key_cdr_typesize > 16 ? Structures_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = Structures_max_key_cdr_typesize > 16 ? Structures_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructuresPubSubType::~StructuresPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool StructuresPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool StructuresPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool StructuresPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool StructuresPubSubType::deserialize( return true; } -std::function StructuresPubSubType::getSerializedSizeProvider( +uint32_t StructuresPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructuresPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructuresPubSubType::create_data() { return reinterpret_cast(new Structures()); } -void StructuresPubSubType::deleteData( +void StructuresPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructuresPubSubType::getKey( +bool StructuresPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool StructuresPubSubType::getKey( const Structures* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), Structures_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 || Structures_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5438,26 +4542,21 @@ void StructuresPubSubType::register_type_object_representation() namespace testing_1 { fooPubSubType::fooPubSubType() { - setName("testing_1::foo"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(foo::getMaxCdrSerializedSize()); - #else - testing_1_foo_max_cdr_typesize; - #endif + set_name("testing_1::foo"); + uint32_t type_size = testing_1_foo_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = testing_1_foo_max_key_cdr_typesize > 16 ? testing_1_foo_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = testing_1_foo_max_key_cdr_typesize > 16 ? testing_1_foo_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } fooPubSubType::~fooPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5475,12 +4574,10 @@ namespace testing_1 { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5495,11 +4592,7 @@ namespace testing_1 { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5516,11 +4609,7 @@ namespace testing_1 { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5537,52 +4626,43 @@ namespace testing_1 { return true; } - std::function fooPubSubType::getSerializedSizeProvider( + uint32_t fooPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* fooPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* fooPubSubType::create_data() { return reinterpret_cast(new foo()); } - void fooPubSubType::deleteData( + void fooPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool fooPubSubType::getKey( + bool fooPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5590,35 +4670,27 @@ namespace testing_1 { const foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), testing_1_foo_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 || testing_1_foo_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5634,26 +4706,21 @@ namespace testing_1 { namespace testing_2 { fooPubSubType::fooPubSubType() { - setName("testing_2::foo"); - uint32_t type_size = - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(foo::getMaxCdrSerializedSize()); - #else - testing_2_foo_max_cdr_typesize; - #endif + set_name("testing_2::foo"); + uint32_t type_size = testing_2_foo_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = testing_2_foo_max_key_cdr_typesize > 16 ? testing_2_foo_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = testing_2_foo_max_key_cdr_typesize > 16 ? testing_2_foo_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } fooPubSubType::~fooPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5671,12 +4738,10 @@ namespace testing_2 { data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - #endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5691,11 +4756,7 @@ namespace testing_2 { } // Get the serialized length - #if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); - #else payload->length = static_cast(ser.get_serialized_data_length()); - #endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5712,11 +4773,7 @@ namespace testing_2 { eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN - #if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR - #endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5733,52 +4790,43 @@ namespace testing_2 { return true; } - std::function fooPubSubType::getSerializedSizeProvider( + uint32_t fooPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { - #if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - #else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } - #endif // FASTCDR_VERSION_MAJOR == 1 - }; - } - - void* fooPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } + } + + void* fooPubSubType::create_data() { return reinterpret_cast(new foo()); } - void fooPubSubType::deleteData( + void fooPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } - bool fooPubSubType::getKey( + bool fooPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5786,35 +4834,27 @@ namespace testing_2 { const foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), testing_2_foo_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 || testing_2_foo_max_key_cdr_typesize > 16) { - m_md5.init(); - #if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); - #else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); - #endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5829,26 +4869,21 @@ namespace testing_2 { barPubSubType::barPubSubType() { - setName("bar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(bar::getMaxCdrSerializedSize()); -#else - bar_max_cdr_typesize; -#endif + set_name("bar"); + uint32_t type_size = bar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = bar_max_key_cdr_typesize > 16 ? bar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = bar_max_key_cdr_typesize > 16 ? bar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } barPubSubType::~barPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5866,12 +4901,10 @@ bool barPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5886,11 +4919,7 @@ bool barPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5907,11 +4936,7 @@ bool barPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5928,52 +4953,43 @@ bool barPubSubType::deserialize( return true; } -std::function barPubSubType::getSerializedSizeProvider( +uint32_t barPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* barPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* barPubSubType::create_data() { return reinterpret_cast(new bar()); } -void barPubSubType::deleteData( +void barPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool barPubSubType::getKey( +bool barPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5981,35 +4997,27 @@ bool barPubSubType::getKey( const bar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), bar_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 || bar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6022,26 +5030,21 @@ void barPubSubType::register_type_object_representation() root1PubSubType::root1PubSubType() { - setName("root1"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(root1::getMaxCdrSerializedSize()); -#else - root1_max_cdr_typesize; -#endif + set_name("root1"); + uint32_t type_size = root1_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = root1_max_key_cdr_typesize > 16 ? root1_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = root1_max_key_cdr_typesize > 16 ? root1_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } root1PubSubType::~root1PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6059,12 +5062,10 @@ bool root1PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6079,11 +5080,7 @@ bool root1PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6100,11 +5097,7 @@ bool root1PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6121,52 +5114,43 @@ bool root1PubSubType::deserialize( return true; } -std::function root1PubSubType::getSerializedSizeProvider( +uint32_t root1PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* root1PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* root1PubSubType::create_data() { return reinterpret_cast(new root1()); } -void root1PubSubType::deleteData( +void root1PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool root1PubSubType::getKey( +bool root1PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6174,35 +5158,27 @@ bool root1PubSubType::getKey( const root1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), root1_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 || root1_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6215,26 +5191,21 @@ void root1PubSubType::register_type_object_representation() root2PubSubType::root2PubSubType() { - setName("root2"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(root2::getMaxCdrSerializedSize()); -#else - root2_max_cdr_typesize; -#endif + set_name("root2"); + uint32_t type_size = root2_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = root2_max_key_cdr_typesize > 16 ? root2_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = root2_max_key_cdr_typesize > 16 ? root2_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } root2PubSubType::~root2PubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6252,12 +5223,10 @@ bool root2PubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6272,11 +5241,7 @@ bool root2PubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6293,11 +5258,7 @@ bool root2PubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6314,52 +5275,43 @@ bool root2PubSubType::deserialize( return true; } -std::function root2PubSubType::getSerializedSizeProvider( +uint32_t root2PubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* root2PubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* root2PubSubType::create_data() { return reinterpret_cast(new root2()); } -void root2PubSubType::deleteData( +void root2PubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool root2PubSubType::getKey( +bool root2PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6367,35 +5319,27 @@ bool root2PubSubType::getKey( const root2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), root2_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 || root2_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6408,26 +5352,21 @@ void root2PubSubType::register_type_object_representation() rootPubSubType::rootPubSubType() { - setName("root"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(root::getMaxCdrSerializedSize()); -#else - root_max_cdr_typesize; -#endif + set_name("root"); + uint32_t type_size = root_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = root_max_key_cdr_typesize > 16 ? root_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = root_max_key_cdr_typesize > 16 ? root_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } rootPubSubType::~rootPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6445,12 +5384,10 @@ bool rootPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6465,11 +5402,7 @@ bool rootPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6486,11 +5419,7 @@ bool rootPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6507,52 +5436,43 @@ bool rootPubSubType::deserialize( return true; } -std::function rootPubSubType::getSerializedSizeProvider( +uint32_t rootPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* rootPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* rootPubSubType::create_data() { return reinterpret_cast(new root()); } -void rootPubSubType::deleteData( +void rootPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool rootPubSubType::getKey( +bool rootPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6560,35 +5480,27 @@ bool rootPubSubType::getKey( const root* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), root_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 || root_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index 882ad142551..969412d34f0 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -62,18 +62,18 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; namespace testing_1 @@ -2136,18 +2136,18 @@ namespace testing_1 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2182,8 +2182,8 @@ namespace testing_1 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace testing_1 @@ -2213,18 +2213,18 @@ namespace testing_2 eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2259,8 +2259,8 @@ namespace testing_2 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; } // namespace testing_2 @@ -2288,18 +2288,18 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2334,8 +2334,8 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2362,18 +2362,18 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2408,8 +2408,8 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2436,18 +2436,18 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2482,8 +2482,8 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2510,18 +2510,18 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2556,8 +2556,8 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/dds-types-test/unionsPubSubTypes.cxx b/test/dds-types-test/unionsPubSubTypes.cxx index 6e430d2bdae..54d69678a90 100644 --- a/test/dds-types-test/unionsPubSubTypes.cxx +++ b/test/dds-types-test/unionsPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; UnionShortPubSubType::UnionShortPubSubType() { - setName("UnionShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionShort::getMaxCdrSerializedSize()); -#else - UnionShort_max_cdr_typesize; -#endif + set_name("UnionShort"); + uint32_t type_size = UnionShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionShort_max_key_cdr_typesize > 16 ? UnionShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionShort_max_key_cdr_typesize > 16 ? UnionShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionShortPubSubType::~UnionShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool UnionShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool UnionShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool UnionShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool UnionShortPubSubType::deserialize( return true; } -std::function UnionShortPubSubType::getSerializedSizeProvider( +uint32_t UnionShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionShortPubSubType::create_data() { return reinterpret_cast(new UnionShort()); } -void UnionShortPubSubType::deleteData( +void UnionShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionShortPubSubType::getKey( +bool UnionShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool UnionShortPubSubType::getKey( const UnionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionShort_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 || UnionShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +194,21 @@ void UnionShortPubSubType::register_type_object_representation() UnionUShortPubSubType::UnionUShortPubSubType() { - setName("UnionUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionUShort::getMaxCdrSerializedSize()); -#else - UnionUShort_max_cdr_typesize; -#endif + set_name("UnionUShort"); + uint32_t type_size = UnionUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionUShort_max_key_cdr_typesize > 16 ? UnionUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionUShort_max_key_cdr_typesize > 16 ? UnionUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionUShortPubSubType::~UnionUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +226,10 @@ bool UnionUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +244,7 @@ bool UnionUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +261,7 @@ bool UnionUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +278,43 @@ bool UnionUShortPubSubType::deserialize( return true; } -std::function UnionUShortPubSubType::getSerializedSizeProvider( +uint32_t UnionUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionUShortPubSubType::create_data() { return reinterpret_cast(new UnionUShort()); } -void UnionUShortPubSubType::deleteData( +void UnionUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionUShortPubSubType::getKey( +bool UnionUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +322,27 @@ bool UnionUShortPubSubType::getKey( const UnionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionUShort_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 || UnionUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +355,21 @@ void UnionUShortPubSubType::register_type_object_representation() UnionLongPubSubType::UnionLongPubSubType() { - setName("UnionLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionLong::getMaxCdrSerializedSize()); -#else - UnionLong_max_cdr_typesize; -#endif + set_name("UnionLong"); + uint32_t type_size = UnionLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionLong_max_key_cdr_typesize > 16 ? UnionLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionLong_max_key_cdr_typesize > 16 ? UnionLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionLongPubSubType::~UnionLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +387,10 @@ bool UnionLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +405,7 @@ bool UnionLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +422,7 @@ bool UnionLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +439,43 @@ bool UnionLongPubSubType::deserialize( return true; } -std::function UnionLongPubSubType::getSerializedSizeProvider( +uint32_t UnionLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionLongPubSubType::create_data() { return reinterpret_cast(new UnionLong()); } -void UnionLongPubSubType::deleteData( +void UnionLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionLongPubSubType::getKey( +bool UnionLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +483,27 @@ bool UnionLongPubSubType::getKey( const UnionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionLong_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 || UnionLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +516,21 @@ void UnionLongPubSubType::register_type_object_representation() UnionULongPubSubType::UnionULongPubSubType() { - setName("UnionULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionULong::getMaxCdrSerializedSize()); -#else - UnionULong_max_cdr_typesize; -#endif + set_name("UnionULong"); + uint32_t type_size = UnionULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionULong_max_key_cdr_typesize > 16 ? UnionULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionULong_max_key_cdr_typesize > 16 ? UnionULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionULongPubSubType::~UnionULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +548,10 @@ bool UnionULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +566,7 @@ bool UnionULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +583,7 @@ bool UnionULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +600,43 @@ bool UnionULongPubSubType::deserialize( return true; } -std::function UnionULongPubSubType::getSerializedSizeProvider( +uint32_t UnionULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionULongPubSubType::create_data() { return reinterpret_cast(new UnionULong()); } -void UnionULongPubSubType::deleteData( +void UnionULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionULongPubSubType::getKey( +bool UnionULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +644,27 @@ bool UnionULongPubSubType::getKey( const UnionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionULong_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 || UnionULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -805,26 +677,21 @@ void UnionULongPubSubType::register_type_object_representation() UnionLongLongPubSubType::UnionLongLongPubSubType() { - setName("UnionLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionLongLong::getMaxCdrSerializedSize()); -#else - UnionLongLong_max_cdr_typesize; -#endif + set_name("UnionLongLong"); + uint32_t type_size = UnionLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionLongLong_max_key_cdr_typesize > 16 ? UnionLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionLongLong_max_key_cdr_typesize > 16 ? UnionLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionLongLongPubSubType::~UnionLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -842,12 +709,10 @@ bool UnionLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -862,11 +727,7 @@ bool UnionLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -883,11 +744,7 @@ bool UnionLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -904,52 +761,43 @@ bool UnionLongLongPubSubType::deserialize( return true; } -std::function UnionLongLongPubSubType::getSerializedSizeProvider( +uint32_t UnionLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionLongLongPubSubType::create_data() { return reinterpret_cast(new UnionLongLong()); } -void UnionLongLongPubSubType::deleteData( +void UnionLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionLongLongPubSubType::getKey( +bool UnionLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -957,35 +805,27 @@ bool UnionLongLongPubSubType::getKey( const UnionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionLongLong_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 || UnionLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -998,26 +838,21 @@ void UnionLongLongPubSubType::register_type_object_representation() UnionULongLongPubSubType::UnionULongLongPubSubType() { - setName("UnionULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionULongLong::getMaxCdrSerializedSize()); -#else - UnionULongLong_max_cdr_typesize; -#endif + set_name("UnionULongLong"); + uint32_t type_size = UnionULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionULongLong_max_key_cdr_typesize > 16 ? UnionULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionULongLong_max_key_cdr_typesize > 16 ? UnionULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionULongLongPubSubType::~UnionULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1035,12 +870,10 @@ bool UnionULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1055,11 +888,7 @@ bool UnionULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1076,11 +905,7 @@ bool UnionULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1097,52 +922,43 @@ bool UnionULongLongPubSubType::deserialize( return true; } -std::function UnionULongLongPubSubType::getSerializedSizeProvider( +uint32_t UnionULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionULongLongPubSubType::create_data() { return reinterpret_cast(new UnionULongLong()); } -void UnionULongLongPubSubType::deleteData( +void UnionULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionULongLongPubSubType::getKey( +bool UnionULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1150,35 +966,27 @@ bool UnionULongLongPubSubType::getKey( const UnionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionULongLong_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 || UnionULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1191,26 +999,21 @@ void UnionULongLongPubSubType::register_type_object_representation() UnionFloatPubSubType::UnionFloatPubSubType() { - setName("UnionFloat"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionFloat::getMaxCdrSerializedSize()); -#else - UnionFloat_max_cdr_typesize; -#endif + set_name("UnionFloat"); + uint32_t type_size = UnionFloat_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionFloat_max_key_cdr_typesize > 16 ? UnionFloat_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionFloat_max_key_cdr_typesize > 16 ? UnionFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionFloatPubSubType::~UnionFloatPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1228,12 +1031,10 @@ bool UnionFloatPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1248,11 +1049,7 @@ bool UnionFloatPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1269,11 +1066,7 @@ bool UnionFloatPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1290,52 +1083,43 @@ bool UnionFloatPubSubType::deserialize( return true; } -std::function UnionFloatPubSubType::getSerializedSizeProvider( +uint32_t UnionFloatPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionFloatPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionFloatPubSubType::create_data() { return reinterpret_cast(new UnionFloat()); } -void UnionFloatPubSubType::deleteData( +void UnionFloatPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionFloatPubSubType::getKey( +bool UnionFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1343,35 +1127,27 @@ bool UnionFloatPubSubType::getKey( const UnionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionFloat_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 || UnionFloat_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1384,26 +1160,21 @@ void UnionFloatPubSubType::register_type_object_representation() UnionDoublePubSubType::UnionDoublePubSubType() { - setName("UnionDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDouble::getMaxCdrSerializedSize()); -#else - UnionDouble_max_cdr_typesize; -#endif + set_name("UnionDouble"); + uint32_t type_size = UnionDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDouble_max_key_cdr_typesize > 16 ? UnionDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDouble_max_key_cdr_typesize > 16 ? UnionDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDoublePubSubType::~UnionDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1421,12 +1192,10 @@ bool UnionDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1441,11 +1210,7 @@ bool UnionDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1462,11 +1227,7 @@ bool UnionDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1483,52 +1244,43 @@ bool UnionDoublePubSubType::deserialize( return true; } -std::function UnionDoublePubSubType::getSerializedSizeProvider( +uint32_t UnionDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDoublePubSubType::create_data() { return reinterpret_cast(new UnionDouble()); } -void UnionDoublePubSubType::deleteData( +void UnionDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDoublePubSubType::getKey( +bool UnionDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1536,35 +1288,27 @@ bool UnionDoublePubSubType::getKey( const UnionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDouble_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 || UnionDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1577,26 +1321,21 @@ void UnionDoublePubSubType::register_type_object_representation() UnionLongDoublePubSubType::UnionLongDoublePubSubType() { - setName("UnionLongDouble"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionLongDouble::getMaxCdrSerializedSize()); -#else - UnionLongDouble_max_cdr_typesize; -#endif + set_name("UnionLongDouble"); + uint32_t type_size = UnionLongDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionLongDouble_max_key_cdr_typesize > 16 ? UnionLongDouble_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionLongDouble_max_key_cdr_typesize > 16 ? UnionLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionLongDoublePubSubType::~UnionLongDoublePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1614,12 +1353,10 @@ bool UnionLongDoublePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1634,11 +1371,7 @@ bool UnionLongDoublePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1655,11 +1388,7 @@ bool UnionLongDoublePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1676,52 +1405,43 @@ bool UnionLongDoublePubSubType::deserialize( return true; } -std::function UnionLongDoublePubSubType::getSerializedSizeProvider( +uint32_t UnionLongDoublePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionLongDoublePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionLongDoublePubSubType::create_data() { return reinterpret_cast(new UnionLongDouble()); } -void UnionLongDoublePubSubType::deleteData( +void UnionLongDoublePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionLongDoublePubSubType::getKey( +bool UnionLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1729,35 +1449,27 @@ bool UnionLongDoublePubSubType::getKey( const UnionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionLongDouble_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 || UnionLongDouble_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1770,26 +1482,21 @@ void UnionLongDoublePubSubType::register_type_object_representation() UnionBooleanPubSubType::UnionBooleanPubSubType() { - setName("UnionBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionBoolean::getMaxCdrSerializedSize()); -#else - UnionBoolean_max_cdr_typesize; -#endif + set_name("UnionBoolean"); + uint32_t type_size = UnionBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionBoolean_max_key_cdr_typesize > 16 ? UnionBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionBoolean_max_key_cdr_typesize > 16 ? UnionBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionBooleanPubSubType::~UnionBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -1807,12 +1514,10 @@ bool UnionBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -1827,11 +1532,7 @@ bool UnionBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -1848,11 +1549,7 @@ bool UnionBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -1869,52 +1566,43 @@ bool UnionBooleanPubSubType::deserialize( return true; } -std::function UnionBooleanPubSubType::getSerializedSizeProvider( +uint32_t UnionBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionBooleanPubSubType::create_data() { return reinterpret_cast(new UnionBoolean()); } -void UnionBooleanPubSubType::deleteData( +void UnionBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionBooleanPubSubType::getKey( +bool UnionBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -1922,35 +1610,27 @@ bool UnionBooleanPubSubType::getKey( const UnionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionBoolean_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 || UnionBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -1963,26 +1643,21 @@ void UnionBooleanPubSubType::register_type_object_representation() UnionOctetPubSubType::UnionOctetPubSubType() { - setName("UnionOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionOctet::getMaxCdrSerializedSize()); -#else - UnionOctet_max_cdr_typesize; -#endif + set_name("UnionOctet"); + uint32_t type_size = UnionOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionOctet_max_key_cdr_typesize > 16 ? UnionOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionOctet_max_key_cdr_typesize > 16 ? UnionOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionOctetPubSubType::~UnionOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2000,12 +1675,10 @@ bool UnionOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2020,11 +1693,7 @@ bool UnionOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2041,11 +1710,7 @@ bool UnionOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2062,52 +1727,43 @@ bool UnionOctetPubSubType::deserialize( return true; } -std::function UnionOctetPubSubType::getSerializedSizeProvider( +uint32_t UnionOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionOctetPubSubType::create_data() { return reinterpret_cast(new UnionOctet()); } -void UnionOctetPubSubType::deleteData( +void UnionOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionOctetPubSubType::getKey( +bool UnionOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2115,35 +1771,27 @@ bool UnionOctetPubSubType::getKey( const UnionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionOctet_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 || UnionOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2156,26 +1804,21 @@ void UnionOctetPubSubType::register_type_object_representation() UnionCharPubSubType::UnionCharPubSubType() { - setName("UnionChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionChar::getMaxCdrSerializedSize()); -#else - UnionChar_max_cdr_typesize; -#endif + set_name("UnionChar"); + uint32_t type_size = UnionChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionChar_max_key_cdr_typesize > 16 ? UnionChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionChar_max_key_cdr_typesize > 16 ? UnionChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionCharPubSubType::~UnionCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2193,12 +1836,10 @@ bool UnionCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2213,11 +1854,7 @@ bool UnionCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2234,11 +1871,7 @@ bool UnionCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2255,52 +1888,43 @@ bool UnionCharPubSubType::deserialize( return true; } -std::function UnionCharPubSubType::getSerializedSizeProvider( +uint32_t UnionCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionCharPubSubType::create_data() { return reinterpret_cast(new UnionChar()); } -void UnionCharPubSubType::deleteData( +void UnionCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionCharPubSubType::getKey( +bool UnionCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2308,35 +1932,27 @@ bool UnionCharPubSubType::getKey( const UnionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionChar_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 || UnionChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2349,26 +1965,21 @@ void UnionCharPubSubType::register_type_object_representation() UnionWCharPubSubType::UnionWCharPubSubType() { - setName("UnionWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionWChar::getMaxCdrSerializedSize()); -#else - UnionWChar_max_cdr_typesize; -#endif + set_name("UnionWChar"); + uint32_t type_size = UnionWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionWChar_max_key_cdr_typesize > 16 ? UnionWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionWChar_max_key_cdr_typesize > 16 ? UnionWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionWCharPubSubType::~UnionWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2386,12 +1997,10 @@ bool UnionWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2406,11 +2015,7 @@ bool UnionWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2427,11 +2032,7 @@ bool UnionWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2448,52 +2049,43 @@ bool UnionWCharPubSubType::deserialize( return true; } -std::function UnionWCharPubSubType::getSerializedSizeProvider( +uint32_t UnionWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionWCharPubSubType::create_data() { return reinterpret_cast(new UnionWChar()); } -void UnionWCharPubSubType::deleteData( +void UnionWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionWCharPubSubType::getKey( +bool UnionWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2501,35 +2093,27 @@ bool UnionWCharPubSubType::getKey( const UnionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionWChar_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 || UnionWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2542,26 +2126,21 @@ void UnionWCharPubSubType::register_type_object_representation() UnionStringPubSubType::UnionStringPubSubType() { - setName("UnionString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionString::getMaxCdrSerializedSize()); -#else - UnionString_max_cdr_typesize; -#endif + set_name("UnionString"); + uint32_t type_size = UnionString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionString_max_key_cdr_typesize > 16 ? UnionString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionString_max_key_cdr_typesize > 16 ? UnionString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionStringPubSubType::~UnionStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2579,12 +2158,10 @@ bool UnionStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2599,11 +2176,7 @@ bool UnionStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2620,11 +2193,7 @@ bool UnionStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2641,52 +2210,43 @@ bool UnionStringPubSubType::deserialize( return true; } -std::function UnionStringPubSubType::getSerializedSizeProvider( +uint32_t UnionStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionStringPubSubType::create_data() { return reinterpret_cast(new UnionString()); } -void UnionStringPubSubType::deleteData( +void UnionStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionStringPubSubType::getKey( +bool UnionStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2694,35 +2254,27 @@ bool UnionStringPubSubType::getKey( const UnionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionString_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 || UnionString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2735,26 +2287,21 @@ void UnionStringPubSubType::register_type_object_representation() UnionWStringPubSubType::UnionWStringPubSubType() { - setName("UnionWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionWString::getMaxCdrSerializedSize()); -#else - UnionWString_max_cdr_typesize; -#endif + set_name("UnionWString"); + uint32_t type_size = UnionWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionWString_max_key_cdr_typesize > 16 ? UnionWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionWString_max_key_cdr_typesize > 16 ? UnionWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionWStringPubSubType::~UnionWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2772,12 +2319,10 @@ bool UnionWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2792,11 +2337,7 @@ bool UnionWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -2813,11 +2354,7 @@ bool UnionWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -2834,52 +2371,43 @@ bool UnionWStringPubSubType::deserialize( return true; } -std::function UnionWStringPubSubType::getSerializedSizeProvider( +uint32_t UnionWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionWStringPubSubType::create_data() { return reinterpret_cast(new UnionWString()); } -void UnionWStringPubSubType::deleteData( +void UnionWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionWStringPubSubType::getKey( +bool UnionWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -2887,35 +2415,27 @@ bool UnionWStringPubSubType::getKey( const UnionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionWString_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 || UnionWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -2928,26 +2448,21 @@ void UnionWStringPubSubType::register_type_object_representation() UnionBoundedStringPubSubType::UnionBoundedStringPubSubType() { - setName("UnionBoundedString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionBoundedString::getMaxCdrSerializedSize()); -#else - UnionBoundedString_max_cdr_typesize; -#endif + set_name("UnionBoundedString"); + uint32_t type_size = UnionBoundedString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionBoundedString_max_key_cdr_typesize > 16 ? UnionBoundedString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionBoundedString_max_key_cdr_typesize > 16 ? UnionBoundedString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionBoundedStringPubSubType::~UnionBoundedStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -2965,12 +2480,10 @@ bool UnionBoundedStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -2985,11 +2498,7 @@ bool UnionBoundedStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3006,11 +2515,7 @@ bool UnionBoundedStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3027,52 +2532,43 @@ bool UnionBoundedStringPubSubType::deserialize( return true; } -std::function UnionBoundedStringPubSubType::getSerializedSizeProvider( +uint32_t UnionBoundedStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionBoundedStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionBoundedStringPubSubType::create_data() { return reinterpret_cast(new UnionBoundedString()); } -void UnionBoundedStringPubSubType::deleteData( +void UnionBoundedStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionBoundedStringPubSubType::getKey( +bool UnionBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3080,35 +2576,27 @@ bool UnionBoundedStringPubSubType::getKey( const UnionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionBoundedString_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 || UnionBoundedString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3121,26 +2609,21 @@ void UnionBoundedStringPubSubType::register_type_object_representation() UnionBoundedWStringPubSubType::UnionBoundedWStringPubSubType() { - setName("UnionBoundedWString"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionBoundedWString::getMaxCdrSerializedSize()); -#else - UnionBoundedWString_max_cdr_typesize; -#endif + set_name("UnionBoundedWString"); + uint32_t type_size = UnionBoundedWString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionBoundedWString_max_key_cdr_typesize > 16 ? UnionBoundedWString_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionBoundedWString_max_key_cdr_typesize > 16 ? UnionBoundedWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionBoundedWStringPubSubType::~UnionBoundedWStringPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3158,12 +2641,10 @@ bool UnionBoundedWStringPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3178,11 +2659,7 @@ bool UnionBoundedWStringPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3199,11 +2676,7 @@ bool UnionBoundedWStringPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3220,52 +2693,43 @@ bool UnionBoundedWStringPubSubType::deserialize( return true; } -std::function UnionBoundedWStringPubSubType::getSerializedSizeProvider( +uint32_t UnionBoundedWStringPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionBoundedWStringPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionBoundedWStringPubSubType::create_data() { return reinterpret_cast(new UnionBoundedWString()); } -void UnionBoundedWStringPubSubType::deleteData( +void UnionBoundedWStringPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionBoundedWStringPubSubType::getKey( +bool UnionBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3273,35 +2737,27 @@ bool UnionBoundedWStringPubSubType::getKey( const UnionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionBoundedWString_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 || UnionBoundedWString_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3314,26 +2770,21 @@ void UnionBoundedWStringPubSubType::register_type_object_representation() UnionInnerEnumHelperPubSubType::UnionInnerEnumHelperPubSubType() { - setName("UnionInnerEnumHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerEnumHelper::getMaxCdrSerializedSize()); -#else - UnionInnerEnumHelper_max_cdr_typesize; -#endif + set_name("UnionInnerEnumHelper"); + uint32_t type_size = UnionInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerEnumHelper_max_key_cdr_typesize > 16 ? UnionInnerEnumHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerEnumHelper_max_key_cdr_typesize > 16 ? UnionInnerEnumHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerEnumHelperPubSubType::~UnionInnerEnumHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3351,12 +2802,10 @@ bool UnionInnerEnumHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3371,11 +2820,7 @@ bool UnionInnerEnumHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3392,11 +2837,7 @@ bool UnionInnerEnumHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3413,52 +2854,43 @@ bool UnionInnerEnumHelperPubSubType::deserialize( return true; } -std::function UnionInnerEnumHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerEnumHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerEnumHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerEnumHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerEnumHelper()); } -void UnionInnerEnumHelperPubSubType::deleteData( +void UnionInnerEnumHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerEnumHelperPubSubType::getKey( +bool UnionInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3466,35 +2898,27 @@ bool UnionInnerEnumHelperPubSubType::getKey( const UnionInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerEnumHelper_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 || UnionInnerEnumHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3507,26 +2931,21 @@ void UnionInnerEnumHelperPubSubType::register_type_object_representation() UnionInnerBitMaskHelperPubSubType::UnionInnerBitMaskHelperPubSubType() { - setName("UnionInnerBitMaskHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerBitMaskHelper::getMaxCdrSerializedSize()); -#else - UnionInnerBitMaskHelper_max_cdr_typesize; -#endif + set_name("UnionInnerBitMaskHelper"); + uint32_t type_size = UnionInnerBitMaskHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerBitMaskHelper_max_key_cdr_typesize > 16 ? UnionInnerBitMaskHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerBitMaskHelper_max_key_cdr_typesize > 16 ? UnionInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerBitMaskHelperPubSubType::~UnionInnerBitMaskHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3544,12 +2963,10 @@ bool UnionInnerBitMaskHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3564,11 +2981,7 @@ bool UnionInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3585,11 +2998,7 @@ bool UnionInnerBitMaskHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3606,52 +3015,43 @@ bool UnionInnerBitMaskHelperPubSubType::deserialize( return true; } -std::function UnionInnerBitMaskHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerBitMaskHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerBitMaskHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerBitMaskHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerBitMaskHelper()); } -void UnionInnerBitMaskHelperPubSubType::deleteData( +void UnionInnerBitMaskHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerBitMaskHelperPubSubType::getKey( +bool UnionInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3659,35 +3059,27 @@ bool UnionInnerBitMaskHelperPubSubType::getKey( const UnionInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerBitMaskHelper_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 || UnionInnerBitMaskHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3700,26 +3092,21 @@ void UnionInnerBitMaskHelperPubSubType::register_type_object_representation() UnionInnerAliasHelperPubSubType::UnionInnerAliasHelperPubSubType() { - setName("UnionInnerAliasHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerAliasHelper::getMaxCdrSerializedSize()); -#else - UnionInnerAliasHelper_max_cdr_typesize; -#endif + set_name("UnionInnerAliasHelper"); + uint32_t type_size = UnionInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerAliasHelper_max_key_cdr_typesize > 16 ? UnionInnerAliasHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerAliasHelper_max_key_cdr_typesize > 16 ? UnionInnerAliasHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerAliasHelperPubSubType::~UnionInnerAliasHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3737,12 +3124,10 @@ bool UnionInnerAliasHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3757,11 +3142,7 @@ bool UnionInnerAliasHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3778,11 +3159,7 @@ bool UnionInnerAliasHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3799,52 +3176,43 @@ bool UnionInnerAliasHelperPubSubType::deserialize( return true; } -std::function UnionInnerAliasHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerAliasHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerAliasHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerAliasHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerAliasHelper()); } -void UnionInnerAliasHelperPubSubType::deleteData( +void UnionInnerAliasHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerAliasHelperPubSubType::getKey( +bool UnionInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -3852,35 +3220,27 @@ bool UnionInnerAliasHelperPubSubType::getKey( const UnionInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerAliasHelper_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 || UnionInnerAliasHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -3893,26 +3253,21 @@ void UnionInnerAliasHelperPubSubType::register_type_object_representation() UnionArrayPubSubType::UnionArrayPubSubType() { - setName("UnionArray"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionArray::getMaxCdrSerializedSize()); -#else - UnionArray_max_cdr_typesize; -#endif + set_name("UnionArray"); + uint32_t type_size = UnionArray_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionArray_max_key_cdr_typesize > 16 ? UnionArray_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionArray_max_key_cdr_typesize > 16 ? UnionArray_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionArrayPubSubType::~UnionArrayPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -3930,12 +3285,10 @@ bool UnionArrayPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -3950,11 +3303,7 @@ bool UnionArrayPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -3971,11 +3320,7 @@ bool UnionArrayPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -3992,52 +3337,43 @@ bool UnionArrayPubSubType::deserialize( return true; } -std::function UnionArrayPubSubType::getSerializedSizeProvider( +uint32_t UnionArrayPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionArrayPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionArrayPubSubType::create_data() { return reinterpret_cast(new UnionArray()); } -void UnionArrayPubSubType::deleteData( +void UnionArrayPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionArrayPubSubType::getKey( +bool UnionArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4045,35 +3381,27 @@ bool UnionArrayPubSubType::getKey( const UnionArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionArray_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 || UnionArray_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4086,26 +3414,21 @@ void UnionArrayPubSubType::register_type_object_representation() UnionSequencePubSubType::UnionSequencePubSubType() { - setName("UnionSequence"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionSequence::getMaxCdrSerializedSize()); -#else - UnionSequence_max_cdr_typesize; -#endif + set_name("UnionSequence"); + uint32_t type_size = UnionSequence_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionSequence_max_key_cdr_typesize > 16 ? UnionSequence_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionSequence_max_key_cdr_typesize > 16 ? UnionSequence_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionSequencePubSubType::~UnionSequencePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4123,12 +3446,10 @@ bool UnionSequencePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4143,11 +3464,7 @@ bool UnionSequencePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4164,11 +3481,7 @@ bool UnionSequencePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4185,52 +3498,43 @@ bool UnionSequencePubSubType::deserialize( return true; } -std::function UnionSequencePubSubType::getSerializedSizeProvider( +uint32_t UnionSequencePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionSequencePubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionSequencePubSubType::create_data() { return reinterpret_cast(new UnionSequence()); } -void UnionSequencePubSubType::deleteData( +void UnionSequencePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionSequencePubSubType::getKey( +bool UnionSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4238,35 +3542,27 @@ bool UnionSequencePubSubType::getKey( const UnionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionSequence_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 || UnionSequence_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4279,26 +3575,21 @@ void UnionSequencePubSubType::register_type_object_representation() UnionMapPubSubType::UnionMapPubSubType() { - setName("UnionMap"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionMap::getMaxCdrSerializedSize()); -#else - UnionMap_max_cdr_typesize; -#endif + set_name("UnionMap"); + uint32_t type_size = UnionMap_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionMap_max_key_cdr_typesize > 16 ? UnionMap_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionMap_max_key_cdr_typesize > 16 ? UnionMap_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionMapPubSubType::~UnionMapPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4316,12 +3607,10 @@ bool UnionMapPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4336,11 +3625,7 @@ bool UnionMapPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4357,11 +3642,7 @@ bool UnionMapPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4378,52 +3659,43 @@ bool UnionMapPubSubType::deserialize( return true; } -std::function UnionMapPubSubType::getSerializedSizeProvider( +uint32_t UnionMapPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionMapPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionMapPubSubType::create_data() { return reinterpret_cast(new UnionMap()); } -void UnionMapPubSubType::deleteData( +void UnionMapPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionMapPubSubType::getKey( +bool UnionMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4431,35 +3703,27 @@ bool UnionMapPubSubType::getKey( const UnionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionMap_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 || UnionMap_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4472,26 +3736,21 @@ void UnionMapPubSubType::register_type_object_representation() UnionInnerUnionHelperPubSubType::UnionInnerUnionHelperPubSubType() { - setName("UnionInnerUnionHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerUnionHelper::getMaxCdrSerializedSize()); -#else - UnionInnerUnionHelper_max_cdr_typesize; -#endif + set_name("UnionInnerUnionHelper"); + uint32_t type_size = UnionInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerUnionHelper_max_key_cdr_typesize > 16 ? UnionInnerUnionHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerUnionHelper_max_key_cdr_typesize > 16 ? UnionInnerUnionHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerUnionHelperPubSubType::~UnionInnerUnionHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4509,12 +3768,10 @@ bool UnionInnerUnionHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4529,11 +3786,7 @@ bool UnionInnerUnionHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4550,11 +3803,7 @@ bool UnionInnerUnionHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4571,52 +3820,43 @@ bool UnionInnerUnionHelperPubSubType::deserialize( return true; } -std::function UnionInnerUnionHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerUnionHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerUnionHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerUnionHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerUnionHelper()); } -void UnionInnerUnionHelperPubSubType::deleteData( +void UnionInnerUnionHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerUnionHelperPubSubType::getKey( +bool UnionInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4624,35 +3864,27 @@ bool UnionInnerUnionHelperPubSubType::getKey( const UnionInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerUnionHelper_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 || UnionInnerUnionHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4665,26 +3897,21 @@ void UnionInnerUnionHelperPubSubType::register_type_object_representation() UnionInnerStructureHelperPubSubType::UnionInnerStructureHelperPubSubType() { - setName("UnionInnerStructureHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerStructureHelper::getMaxCdrSerializedSize()); -#else - UnionInnerStructureHelper_max_cdr_typesize; -#endif + set_name("UnionInnerStructureHelper"); + uint32_t type_size = UnionInnerStructureHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerStructureHelper_max_key_cdr_typesize > 16 ? UnionInnerStructureHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerStructureHelper_max_key_cdr_typesize > 16 ? UnionInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerStructureHelperPubSubType::~UnionInnerStructureHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4702,12 +3929,10 @@ bool UnionInnerStructureHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4722,11 +3947,7 @@ bool UnionInnerStructureHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4743,11 +3964,7 @@ bool UnionInnerStructureHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4764,52 +3981,43 @@ bool UnionInnerStructureHelperPubSubType::deserialize( return true; } -std::function UnionInnerStructureHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerStructureHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerStructureHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerStructureHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerStructureHelper()); } -void UnionInnerStructureHelperPubSubType::deleteData( +void UnionInnerStructureHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerStructureHelperPubSubType::getKey( +bool UnionInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -4817,35 +4025,27 @@ bool UnionInnerStructureHelperPubSubType::getKey( const UnionInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerStructureHelper_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 || UnionInnerStructureHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -4858,26 +4058,21 @@ void UnionInnerStructureHelperPubSubType::register_type_object_representation() UnionInnerBitsetHelperPubSubType::UnionInnerBitsetHelperPubSubType() { - setName("UnionInnerBitsetHelper"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionInnerBitsetHelper::getMaxCdrSerializedSize()); -#else - UnionInnerBitsetHelper_max_cdr_typesize; -#endif + set_name("UnionInnerBitsetHelper"); + uint32_t type_size = UnionInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionInnerBitsetHelper_max_key_cdr_typesize > 16 ? UnionInnerBitsetHelper_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionInnerBitsetHelper_max_key_cdr_typesize > 16 ? UnionInnerBitsetHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionInnerBitsetHelperPubSubType::~UnionInnerBitsetHelperPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -4895,12 +4090,10 @@ bool UnionInnerBitsetHelperPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -4915,11 +4108,7 @@ bool UnionInnerBitsetHelperPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -4936,11 +4125,7 @@ bool UnionInnerBitsetHelperPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -4957,52 +4142,43 @@ bool UnionInnerBitsetHelperPubSubType::deserialize( return true; } -std::function UnionInnerBitsetHelperPubSubType::getSerializedSizeProvider( +uint32_t UnionInnerBitsetHelperPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionInnerBitsetHelperPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionInnerBitsetHelperPubSubType::create_data() { return reinterpret_cast(new UnionInnerBitsetHelper()); } -void UnionInnerBitsetHelperPubSubType::deleteData( +void UnionInnerBitsetHelperPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionInnerBitsetHelperPubSubType::getKey( +bool UnionInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5010,35 +4186,27 @@ bool UnionInnerBitsetHelperPubSubType::getKey( const UnionInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionInnerBitsetHelper_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 || UnionInnerBitsetHelper_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5051,26 +4219,21 @@ void UnionInnerBitsetHelperPubSubType::register_type_object_representation() UnionDiscriminatorShortPubSubType::UnionDiscriminatorShortPubSubType() { - setName("UnionDiscriminatorShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorShort::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorShort_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorShort"); + uint32_t type_size = UnionDiscriminatorShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorShort_max_key_cdr_typesize > 16 ? UnionDiscriminatorShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorShort_max_key_cdr_typesize > 16 ? UnionDiscriminatorShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorShortPubSubType::~UnionDiscriminatorShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5088,12 +4251,10 @@ bool UnionDiscriminatorShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5108,11 +4269,7 @@ bool UnionDiscriminatorShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5129,11 +4286,7 @@ bool UnionDiscriminatorShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5150,52 +4303,43 @@ bool UnionDiscriminatorShortPubSubType::deserialize( return true; } -std::function UnionDiscriminatorShortPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorShortPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorShort()); } -void UnionDiscriminatorShortPubSubType::deleteData( +void UnionDiscriminatorShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorShortPubSubType::getKey( +bool UnionDiscriminatorShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5203,35 +4347,27 @@ bool UnionDiscriminatorShortPubSubType::getKey( const UnionDiscriminatorShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorShort_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 || UnionDiscriminatorShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5244,26 +4380,21 @@ void UnionDiscriminatorShortPubSubType::register_type_object_representation() UnionDiscriminatorUShortPubSubType::UnionDiscriminatorUShortPubSubType() { - setName("UnionDiscriminatorUShort"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorUShort::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorUShort_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorUShort"); + uint32_t type_size = UnionDiscriminatorUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorUShort_max_key_cdr_typesize > 16 ? UnionDiscriminatorUShort_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorUShort_max_key_cdr_typesize > 16 ? UnionDiscriminatorUShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorUShortPubSubType::~UnionDiscriminatorUShortPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5281,12 +4412,10 @@ bool UnionDiscriminatorUShortPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5301,11 +4430,7 @@ bool UnionDiscriminatorUShortPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5322,11 +4447,7 @@ bool UnionDiscriminatorUShortPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5343,52 +4464,43 @@ bool UnionDiscriminatorUShortPubSubType::deserialize( return true; } -std::function UnionDiscriminatorUShortPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorUShortPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorUShortPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorUShortPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorUShort()); } -void UnionDiscriminatorUShortPubSubType::deleteData( +void UnionDiscriminatorUShortPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorUShortPubSubType::getKey( +bool UnionDiscriminatorUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5396,35 +4508,27 @@ bool UnionDiscriminatorUShortPubSubType::getKey( const UnionDiscriminatorUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorUShort_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 || UnionDiscriminatorUShort_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5437,26 +4541,21 @@ void UnionDiscriminatorUShortPubSubType::register_type_object_representation() UnionDiscriminatorLongPubSubType::UnionDiscriminatorLongPubSubType() { - setName("UnionDiscriminatorLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorLong::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorLong_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorLong"); + uint32_t type_size = UnionDiscriminatorLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorLongPubSubType::~UnionDiscriminatorLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5474,12 +4573,10 @@ bool UnionDiscriminatorLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5494,11 +4591,7 @@ bool UnionDiscriminatorLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5515,11 +4608,7 @@ bool UnionDiscriminatorLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5536,52 +4625,43 @@ bool UnionDiscriminatorLongPubSubType::deserialize( return true; } -std::function UnionDiscriminatorLongPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorLongPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorLong()); } -void UnionDiscriminatorLongPubSubType::deleteData( +void UnionDiscriminatorLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorLongPubSubType::getKey( +bool UnionDiscriminatorLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5589,35 +4669,27 @@ bool UnionDiscriminatorLongPubSubType::getKey( const UnionDiscriminatorLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorLong_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 || UnionDiscriminatorLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5630,26 +4702,21 @@ void UnionDiscriminatorLongPubSubType::register_type_object_representation() UnionDiscriminatorULongPubSubType::UnionDiscriminatorULongPubSubType() { - setName("UnionDiscriminatorULong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorULong::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorULong_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorULong"); + uint32_t type_size = UnionDiscriminatorULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorULong_max_key_cdr_typesize > 16 ? UnionDiscriminatorULong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorULong_max_key_cdr_typesize > 16 ? UnionDiscriminatorULong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorULongPubSubType::~UnionDiscriminatorULongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5667,12 +4734,10 @@ bool UnionDiscriminatorULongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5687,11 +4752,7 @@ bool UnionDiscriminatorULongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5708,11 +4769,7 @@ bool UnionDiscriminatorULongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5729,52 +4786,43 @@ bool UnionDiscriminatorULongPubSubType::deserialize( return true; } -std::function UnionDiscriminatorULongPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorULongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorULongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorULongPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorULong()); } -void UnionDiscriminatorULongPubSubType::deleteData( +void UnionDiscriminatorULongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorULongPubSubType::getKey( +bool UnionDiscriminatorULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5782,35 +4830,27 @@ bool UnionDiscriminatorULongPubSubType::getKey( const UnionDiscriminatorULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorULong_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 || UnionDiscriminatorULong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -5823,26 +4863,21 @@ void UnionDiscriminatorULongPubSubType::register_type_object_representation() UnionDiscriminatorLongLongPubSubType::UnionDiscriminatorLongLongPubSubType() { - setName("UnionDiscriminatorLongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorLongLong::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorLongLong_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorLongLong"); + uint32_t type_size = UnionDiscriminatorLongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorLongLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorLongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorLongLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorLongLongPubSubType::~UnionDiscriminatorLongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -5860,12 +4895,10 @@ bool UnionDiscriminatorLongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -5880,11 +4913,7 @@ bool UnionDiscriminatorLongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -5901,11 +4930,7 @@ bool UnionDiscriminatorLongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -5922,52 +4947,43 @@ bool UnionDiscriminatorLongLongPubSubType::deserialize( return true; } -std::function UnionDiscriminatorLongLongPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorLongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorLongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorLongLongPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorLongLong()); } -void UnionDiscriminatorLongLongPubSubType::deleteData( +void UnionDiscriminatorLongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorLongLongPubSubType::getKey( +bool UnionDiscriminatorLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -5975,35 +4991,27 @@ bool UnionDiscriminatorLongLongPubSubType::getKey( const UnionDiscriminatorLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorLongLong_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 || UnionDiscriminatorLongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6016,26 +5024,21 @@ void UnionDiscriminatorLongLongPubSubType::register_type_object_representation() UnionDiscriminatorULongLongPubSubType::UnionDiscriminatorULongLongPubSubType() { - setName("UnionDiscriminatorULongLong"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorULongLong::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorULongLong_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorULongLong"); + uint32_t type_size = UnionDiscriminatorULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorULongLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorULongLong_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorULongLong_max_key_cdr_typesize > 16 ? UnionDiscriminatorULongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorULongLongPubSubType::~UnionDiscriminatorULongLongPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6053,12 +5056,10 @@ bool UnionDiscriminatorULongLongPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6073,11 +5074,7 @@ bool UnionDiscriminatorULongLongPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6094,11 +5091,7 @@ bool UnionDiscriminatorULongLongPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6115,52 +5108,43 @@ bool UnionDiscriminatorULongLongPubSubType::deserialize( return true; } -std::function UnionDiscriminatorULongLongPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorULongLongPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorULongLongPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorULongLongPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorULongLong()); } -void UnionDiscriminatorULongLongPubSubType::deleteData( +void UnionDiscriminatorULongLongPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorULongLongPubSubType::getKey( +bool UnionDiscriminatorULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6168,35 +5152,27 @@ bool UnionDiscriminatorULongLongPubSubType::getKey( const UnionDiscriminatorULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorULongLong_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 || UnionDiscriminatorULongLong_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6209,26 +5185,21 @@ void UnionDiscriminatorULongLongPubSubType::register_type_object_representation( UnionDiscriminatorBooleanPubSubType::UnionDiscriminatorBooleanPubSubType() { - setName("UnionDiscriminatorBoolean"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorBoolean::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorBoolean_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorBoolean"); + uint32_t type_size = UnionDiscriminatorBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorBoolean_max_key_cdr_typesize > 16 ? UnionDiscriminatorBoolean_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorBoolean_max_key_cdr_typesize > 16 ? UnionDiscriminatorBoolean_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorBooleanPubSubType::~UnionDiscriminatorBooleanPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6246,12 +5217,10 @@ bool UnionDiscriminatorBooleanPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6266,11 +5235,7 @@ bool UnionDiscriminatorBooleanPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6287,11 +5252,7 @@ bool UnionDiscriminatorBooleanPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6308,52 +5269,43 @@ bool UnionDiscriminatorBooleanPubSubType::deserialize( return true; } -std::function UnionDiscriminatorBooleanPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorBooleanPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorBooleanPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorBooleanPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorBoolean()); } -void UnionDiscriminatorBooleanPubSubType::deleteData( +void UnionDiscriminatorBooleanPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorBooleanPubSubType::getKey( +bool UnionDiscriminatorBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6361,35 +5313,27 @@ bool UnionDiscriminatorBooleanPubSubType::getKey( const UnionDiscriminatorBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorBoolean_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 || UnionDiscriminatorBoolean_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6402,26 +5346,21 @@ void UnionDiscriminatorBooleanPubSubType::register_type_object_representation() UnionDiscriminatorOctetPubSubType::UnionDiscriminatorOctetPubSubType() { - setName("UnionDiscriminatorOctet"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorOctet::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorOctet_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorOctet"); + uint32_t type_size = UnionDiscriminatorOctet_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorOctet_max_key_cdr_typesize > 16 ? UnionDiscriminatorOctet_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorOctet_max_key_cdr_typesize > 16 ? UnionDiscriminatorOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorOctetPubSubType::~UnionDiscriminatorOctetPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6439,12 +5378,10 @@ bool UnionDiscriminatorOctetPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6459,11 +5396,7 @@ bool UnionDiscriminatorOctetPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6480,11 +5413,7 @@ bool UnionDiscriminatorOctetPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6501,52 +5430,43 @@ bool UnionDiscriminatorOctetPubSubType::deserialize( return true; } -std::function UnionDiscriminatorOctetPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorOctetPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorOctetPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorOctetPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorOctet()); } -void UnionDiscriminatorOctetPubSubType::deleteData( +void UnionDiscriminatorOctetPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorOctetPubSubType::getKey( +bool UnionDiscriminatorOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6554,35 +5474,27 @@ bool UnionDiscriminatorOctetPubSubType::getKey( const UnionDiscriminatorOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorOctet_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 || UnionDiscriminatorOctet_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6595,26 +5507,21 @@ void UnionDiscriminatorOctetPubSubType::register_type_object_representation() UnionDiscriminatorCharPubSubType::UnionDiscriminatorCharPubSubType() { - setName("UnionDiscriminatorChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorChar::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorChar_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorChar"); + uint32_t type_size = UnionDiscriminatorChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorChar_max_key_cdr_typesize > 16 ? UnionDiscriminatorChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorChar_max_key_cdr_typesize > 16 ? UnionDiscriminatorChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorCharPubSubType::~UnionDiscriminatorCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6632,12 +5539,10 @@ bool UnionDiscriminatorCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6652,11 +5557,7 @@ bool UnionDiscriminatorCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6673,11 +5574,7 @@ bool UnionDiscriminatorCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6694,52 +5591,43 @@ bool UnionDiscriminatorCharPubSubType::deserialize( return true; } -std::function UnionDiscriminatorCharPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorCharPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorChar()); } -void UnionDiscriminatorCharPubSubType::deleteData( +void UnionDiscriminatorCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorCharPubSubType::getKey( +bool UnionDiscriminatorCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6747,35 +5635,27 @@ bool UnionDiscriminatorCharPubSubType::getKey( const UnionDiscriminatorChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorChar_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 || UnionDiscriminatorChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6788,26 +5668,21 @@ void UnionDiscriminatorCharPubSubType::register_type_object_representation() UnionDiscriminatorWCharPubSubType::UnionDiscriminatorWCharPubSubType() { - setName("UnionDiscriminatorWChar"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorWChar::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorWChar_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorWChar"); + uint32_t type_size = UnionDiscriminatorWChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorWChar_max_key_cdr_typesize > 16 ? UnionDiscriminatorWChar_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorWChar_max_key_cdr_typesize > 16 ? UnionDiscriminatorWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorWCharPubSubType::~UnionDiscriminatorWCharPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -6825,12 +5700,10 @@ bool UnionDiscriminatorWCharPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -6845,11 +5718,7 @@ bool UnionDiscriminatorWCharPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -6866,11 +5735,7 @@ bool UnionDiscriminatorWCharPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -6887,52 +5752,43 @@ bool UnionDiscriminatorWCharPubSubType::deserialize( return true; } -std::function UnionDiscriminatorWCharPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorWCharPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorWCharPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorWCharPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorWChar()); } -void UnionDiscriminatorWCharPubSubType::deleteData( +void UnionDiscriminatorWCharPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorWCharPubSubType::getKey( +bool UnionDiscriminatorWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -6940,35 +5796,27 @@ bool UnionDiscriminatorWCharPubSubType::getKey( const UnionDiscriminatorWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorWChar_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 || UnionDiscriminatorWChar_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -6981,26 +5829,21 @@ void UnionDiscriminatorWCharPubSubType::register_type_object_representation() UnionDiscriminatorEnumPubSubType::UnionDiscriminatorEnumPubSubType() { - setName("UnionDiscriminatorEnum"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorEnum::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorEnum_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorEnum"); + uint32_t type_size = UnionDiscriminatorEnum_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorEnum_max_key_cdr_typesize > 16 ? UnionDiscriminatorEnum_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorEnum_max_key_cdr_typesize > 16 ? UnionDiscriminatorEnum_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorEnumPubSubType::~UnionDiscriminatorEnumPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7018,12 +5861,10 @@ bool UnionDiscriminatorEnumPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7038,11 +5879,7 @@ bool UnionDiscriminatorEnumPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7059,11 +5896,7 @@ bool UnionDiscriminatorEnumPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7080,52 +5913,43 @@ bool UnionDiscriminatorEnumPubSubType::deserialize( return true; } -std::function UnionDiscriminatorEnumPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorEnumPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorEnumPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorEnumPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorEnum()); } -void UnionDiscriminatorEnumPubSubType::deleteData( +void UnionDiscriminatorEnumPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorEnumPubSubType::getKey( +bool UnionDiscriminatorEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7133,35 +5957,27 @@ bool UnionDiscriminatorEnumPubSubType::getKey( const UnionDiscriminatorEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorEnum_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 || UnionDiscriminatorEnum_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7174,26 +5990,21 @@ void UnionDiscriminatorEnumPubSubType::register_type_object_representation() UnionDiscriminatorEnumLabelPubSubType::UnionDiscriminatorEnumLabelPubSubType() { - setName("UnionDiscriminatorEnumLabel"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorEnumLabel::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorEnumLabel_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorEnumLabel"); + uint32_t type_size = UnionDiscriminatorEnumLabel_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorEnumLabel_max_key_cdr_typesize > 16 ? UnionDiscriminatorEnumLabel_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorEnumLabel_max_key_cdr_typesize > 16 ? UnionDiscriminatorEnumLabel_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorEnumLabelPubSubType::~UnionDiscriminatorEnumLabelPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7211,12 +6022,10 @@ bool UnionDiscriminatorEnumLabelPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7231,11 +6040,7 @@ bool UnionDiscriminatorEnumLabelPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7252,11 +6057,7 @@ bool UnionDiscriminatorEnumLabelPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7273,52 +6074,43 @@ bool UnionDiscriminatorEnumLabelPubSubType::deserialize( return true; } -std::function UnionDiscriminatorEnumLabelPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorEnumLabelPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorEnumLabelPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorEnumLabelPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorEnumLabel()); } -void UnionDiscriminatorEnumLabelPubSubType::deleteData( +void UnionDiscriminatorEnumLabelPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorEnumLabelPubSubType::getKey( +bool UnionDiscriminatorEnumLabelPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7326,35 +6118,27 @@ bool UnionDiscriminatorEnumLabelPubSubType::getKey( const UnionDiscriminatorEnumLabel* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorEnumLabel_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 || UnionDiscriminatorEnumLabel_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7367,26 +6151,21 @@ void UnionDiscriminatorEnumLabelPubSubType::register_type_object_representation( UnionDiscriminatorAliasPubSubType::UnionDiscriminatorAliasPubSubType() { - setName("UnionDiscriminatorAlias"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionDiscriminatorAlias::getMaxCdrSerializedSize()); -#else - UnionDiscriminatorAlias_max_cdr_typesize; -#endif + set_name("UnionDiscriminatorAlias"); + uint32_t type_size = UnionDiscriminatorAlias_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionDiscriminatorAlias_max_key_cdr_typesize > 16 ? UnionDiscriminatorAlias_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionDiscriminatorAlias_max_key_cdr_typesize > 16 ? UnionDiscriminatorAlias_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionDiscriminatorAliasPubSubType::~UnionDiscriminatorAliasPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7404,12 +6183,10 @@ bool UnionDiscriminatorAliasPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7424,11 +6201,7 @@ bool UnionDiscriminatorAliasPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7445,11 +6218,7 @@ bool UnionDiscriminatorAliasPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7466,52 +6235,43 @@ bool UnionDiscriminatorAliasPubSubType::deserialize( return true; } -std::function UnionDiscriminatorAliasPubSubType::getSerializedSizeProvider( +uint32_t UnionDiscriminatorAliasPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionDiscriminatorAliasPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionDiscriminatorAliasPubSubType::create_data() { return reinterpret_cast(new UnionDiscriminatorAlias()); } -void UnionDiscriminatorAliasPubSubType::deleteData( +void UnionDiscriminatorAliasPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionDiscriminatorAliasPubSubType::getKey( +bool UnionDiscriminatorAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7519,35 +6279,27 @@ bool UnionDiscriminatorAliasPubSubType::getKey( const UnionDiscriminatorAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionDiscriminatorAlias_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 || UnionDiscriminatorAlias_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7560,26 +6312,21 @@ void UnionDiscriminatorAliasPubSubType::register_type_object_representation() UnionSeveralFieldsPubSubType::UnionSeveralFieldsPubSubType() { - setName("UnionSeveralFields"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionSeveralFields::getMaxCdrSerializedSize()); -#else - UnionSeveralFields_max_cdr_typesize; -#endif + set_name("UnionSeveralFields"); + uint32_t type_size = UnionSeveralFields_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionSeveralFields_max_key_cdr_typesize > 16 ? UnionSeveralFields_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionSeveralFields_max_key_cdr_typesize > 16 ? UnionSeveralFields_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionSeveralFieldsPubSubType::~UnionSeveralFieldsPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7597,12 +6344,10 @@ bool UnionSeveralFieldsPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7617,11 +6362,7 @@ bool UnionSeveralFieldsPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7638,11 +6379,7 @@ bool UnionSeveralFieldsPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7659,52 +6396,43 @@ bool UnionSeveralFieldsPubSubType::deserialize( return true; } -std::function UnionSeveralFieldsPubSubType::getSerializedSizeProvider( +uint32_t UnionSeveralFieldsPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionSeveralFieldsPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionSeveralFieldsPubSubType::create_data() { return reinterpret_cast(new UnionSeveralFields()); } -void UnionSeveralFieldsPubSubType::deleteData( +void UnionSeveralFieldsPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionSeveralFieldsPubSubType::getKey( +bool UnionSeveralFieldsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7712,35 +6440,27 @@ bool UnionSeveralFieldsPubSubType::getKey( const UnionSeveralFields* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionSeveralFields_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 || UnionSeveralFields_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -7753,26 +6473,21 @@ void UnionSeveralFieldsPubSubType::register_type_object_representation() UnionSeveralFieldsWithDefaultPubSubType::UnionSeveralFieldsWithDefaultPubSubType() { - setName("UnionSeveralFieldsWithDefault"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionSeveralFieldsWithDefault::getMaxCdrSerializedSize()); -#else - UnionSeveralFieldsWithDefault_max_cdr_typesize; -#endif + set_name("UnionSeveralFieldsWithDefault"); + uint32_t type_size = UnionSeveralFieldsWithDefault_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionSeveralFieldsWithDefault_max_key_cdr_typesize > 16 ? UnionSeveralFieldsWithDefault_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionSeveralFieldsWithDefault_max_key_cdr_typesize > 16 ? UnionSeveralFieldsWithDefault_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionSeveralFieldsWithDefaultPubSubType::~UnionSeveralFieldsWithDefaultPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -7790,12 +6505,10 @@ bool UnionSeveralFieldsWithDefaultPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -7810,11 +6523,7 @@ bool UnionSeveralFieldsWithDefaultPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -7831,11 +6540,7 @@ bool UnionSeveralFieldsWithDefaultPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -7852,52 +6557,43 @@ bool UnionSeveralFieldsWithDefaultPubSubType::deserialize( return true; } -std::function UnionSeveralFieldsWithDefaultPubSubType::getSerializedSizeProvider( +uint32_t UnionSeveralFieldsWithDefaultPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* UnionSeveralFieldsWithDefaultPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* UnionSeveralFieldsWithDefaultPubSubType::create_data() { return reinterpret_cast(new UnionSeveralFieldsWithDefault()); } -void UnionSeveralFieldsWithDefaultPubSubType::deleteData( +void UnionSeveralFieldsWithDefaultPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionSeveralFieldsWithDefaultPubSubType::getKey( +bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -7905,35 +6601,27 @@ bool UnionSeveralFieldsWithDefaultPubSubType::getKey( const UnionSeveralFieldsWithDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionSeveralFieldsWithDefault_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 || UnionSeveralFieldsWithDefault_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index 7ab74304023..962abf4b9c2 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -62,18 +62,18 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -108,8 +108,8 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -136,18 +136,18 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -182,8 +182,8 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -210,18 +210,18 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -256,8 +256,8 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -284,18 +284,18 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -330,8 +330,8 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -358,18 +358,18 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -404,8 +404,8 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -432,18 +432,18 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -478,8 +478,8 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -506,18 +506,18 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -552,8 +552,8 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -580,18 +580,18 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -626,8 +626,8 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -654,18 +654,18 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -700,8 +700,8 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -728,18 +728,18 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -774,8 +774,8 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -802,18 +802,18 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -848,8 +848,8 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -876,18 +876,18 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -922,8 +922,8 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -950,18 +950,18 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -996,8 +996,8 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1024,18 +1024,18 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1070,8 +1070,8 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1098,18 +1098,18 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1144,8 +1144,8 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1172,18 +1172,18 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1218,8 +1218,8 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1246,18 +1246,18 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1292,8 +1292,8 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1320,18 +1320,18 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1366,8 +1366,8 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1394,18 +1394,18 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1440,8 +1440,8 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1468,18 +1468,18 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1514,8 +1514,8 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1542,18 +1542,18 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1588,8 +1588,8 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1616,18 +1616,18 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1662,8 +1662,8 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1690,18 +1690,18 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1736,8 +1736,8 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1764,18 +1764,18 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1810,8 +1810,8 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1838,18 +1838,18 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1884,8 +1884,8 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1912,18 +1912,18 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -1958,8 +1958,8 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -1986,18 +1986,18 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2032,8 +2032,8 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2060,18 +2060,18 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2106,8 +2106,8 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2134,18 +2134,18 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2180,8 +2180,8 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2208,18 +2208,18 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2254,8 +2254,8 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2282,18 +2282,18 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2328,8 +2328,8 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2356,18 +2356,18 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2402,8 +2402,8 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2430,18 +2430,18 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2476,8 +2476,8 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2504,18 +2504,18 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2550,8 +2550,8 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2578,18 +2578,18 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2624,8 +2624,8 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2652,18 +2652,18 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2698,8 +2698,8 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2726,18 +2726,18 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2772,8 +2772,8 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2800,18 +2800,18 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2846,8 +2846,8 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2874,18 +2874,18 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2920,8 +2920,8 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -2948,18 +2948,18 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -2994,8 +2994,8 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -3022,18 +3022,18 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -3068,8 +3068,8 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp index 11f24002514..edd9c7ce538 100644 --- a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp +++ b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp @@ -111,8 +111,8 @@ class DynamicTypesDDSTypesTest : public ::testing::Test { TypeSupport dyn_pubsubType {new DynamicPubSubType(type)}; - uint32_t dyn_payloadSize = static_cast(dyn_pubsubType.get_serialized_size_provider(&data, - data_representation)()); + uint32_t dyn_payloadSize = static_cast(dyn_pubsubType.calculate_serialized_size(&data, + data_representation)); // Dynamic Serialization <-> Dynamic Deserialization eprosima::fastdds::rtps::SerializedPayload_t dyn_payload(dyn_payloadSize); @@ -125,8 +125,8 @@ class DynamicTypesDDSTypesTest : public ::testing::Test ASSERT_TRUE(static_pubsubType.deserialize(&dyn_payload, &data_static)); // Static Serialization <-> Dynamic Deserialization - uint32_t static_payloadSize = static_cast(static_pubsubType.get_serialized_size_provider(&data_static, - data_representation)()); + uint32_t static_payloadSize = static_pubsubType.calculate_serialized_size(&data_static, + data_representation); EXPECT_EQ(static_payloadSize, dyn_payloadSize); eprosima::fastdds::rtps::SerializedPayload_t static_payload(static_payloadSize); ASSERT_TRUE(static_pubsubType.serialize(&data_static, &static_payload, data_representation)); diff --git a/test/feature/dynamic_types/DynamicTypesTests.cpp b/test/feature/dynamic_types/DynamicTypesTests.cpp index f758dd0cec4..9db870e8602 100644 --- a/test/feature/dynamic_types/DynamicTypesTests.cpp +++ b/test/feature/dynamic_types/DynamicTypesTests.cpp @@ -45,11 +45,11 @@ void encoding_decoding_test( { TypeSupport pubsubType {new DynamicPubSubType(created_type)}; uint32_t payloadSize = - static_cast(pubsubType.get_serialized_size_provider(&encoding_data, encoding)()); + static_cast(pubsubType.calculate_serialized_size(&encoding_data, encoding)); SerializedPayload_t payload(payloadSize); EXPECT_TRUE(pubsubType.serialize(&encoding_data, &payload, encoding)); EXPECT_EQ(payload.length, payloadSize); - EXPECT_LE(payload.length, pubsubType->m_typeSize); + EXPECT_LE(payload.length, pubsubType->max_serialized_type_size); EXPECT_TRUE(pubsubType.deserialize(&payload, &decoding_data)); EXPECT_TRUE(decoding_data->equals(encoding_data)); @@ -12733,7 +12733,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_1) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { 0x12, 0x34, 0x56, 0x78, @@ -12803,7 +12803,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_2) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { 0xf9, 0x1a, 0x59, 0xe3, @@ -12910,7 +12910,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_3) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { 0x37, 0x4b, 0x96, 0xe2, diff --git a/test/performance/latency/LatencyTestPublisher.cpp b/test/performance/latency/LatencyTestPublisher.cpp index 5b428e5799c..7d0d3df48c3 100644 --- a/test/performance/latency/LatencyTestPublisher.cpp +++ b/test/performance/latency/LatencyTestPublisher.cpp @@ -711,8 +711,8 @@ bool LatencyTestPublisher::test( if (dynamic_types_) { - dynamic_data_in_ = static_cast(dynamic_pub_sub_type_->createData()); - dynamic_data_out_ = static_cast(dynamic_pub_sub_type_->createData()); + dynamic_data_in_ = static_cast(dynamic_pub_sub_type_->create_data()); + dynamic_data_out_ = static_cast(dynamic_pub_sub_type_->create_data()); if (nullptr == dynamic_data_in_) { @@ -750,11 +750,11 @@ bool LatencyTestPublisher::test( if (!data_loans_) { // Create the reception data sample - latency_data_in_ = static_cast(latency_data_type_->createData()); + latency_data_in_ = static_cast(latency_data_type_->create_data()); } // On loans scenario this object will be kept only to check the echoed sample is correct // On the ordinary case it keeps the object to send - latency_data_out_ = static_cast(latency_data_type_->createData()); + latency_data_out_ = static_cast(latency_data_type_->create_data()); } else { @@ -898,8 +898,8 @@ bool LatencyTestPublisher::test( // Delete Data Sample if (dynamic_types_) { - dynamic_pub_sub_type_->deleteData(dynamic_data_in_); - dynamic_pub_sub_type_->deleteData(dynamic_data_out_); + dynamic_pub_sub_type_->delete_data(dynamic_data_in_); + dynamic_pub_sub_type_->delete_data(dynamic_data_out_); } else { diff --git a/test/performance/latency/LatencyTestSubscriber.cpp b/test/performance/latency/LatencyTestSubscriber.cpp index 99a4fc856b1..6e82cd5aaf2 100644 --- a/test/performance/latency/LatencyTestSubscriber.cpp +++ b/test/performance/latency/LatencyTestSubscriber.cpp @@ -661,7 +661,7 @@ bool LatencyTestSubscriber::test( if (dynamic_types_) { // Create the data sample - dynamic_data_ = static_cast(dynamic_pub_sub_type_->createData()); + dynamic_data_ = static_cast(dynamic_pub_sub_type_->create_data()); if (nullptr == dynamic_data_) { @@ -727,7 +727,7 @@ bool LatencyTestSubscriber::test( if (dynamic_types_) { - dynamic_pub_sub_type_->deleteData(dynamic_data_); + dynamic_pub_sub_type_->delete_data(dynamic_data_); // // Reset history for the new test size_t removed; @@ -736,7 +736,7 @@ bool LatencyTestSubscriber::test( else { // release the buffer next iteration will require different size - latency_data_type_->deleteData(latency_data_); + latency_data_type_->delete_data(latency_data_); // Remove endpoints associated to the given payload size if (!destroy_data_endpoints()) diff --git a/test/performance/latency/LatencyTestTypes.cpp b/test/performance/latency/LatencyTestTypes.cpp index 199db866174..68276ac8dcf 100644 --- a/test/performance/latency/LatencyTestTypes.cpp +++ b/test/performance/latency/LatencyTestTypes.cpp @@ -69,7 +69,7 @@ bool LatencyDataType::serialize( memcpy(ser_data, <->bounce, sizeof(lt->bounce)); ser_data += sizeof(lt->bounce); memcpy(ser_data, lt->data, buffer_size_); - payload->length = m_typeSize; + payload->length = max_serialized_type_size; return true; } @@ -88,23 +88,19 @@ bool LatencyDataType::deserialize( return true; } -std::function LatencyDataType::getSerializedSizeProvider( +uint32_t LatencyDataType::calculate_serialized_size( const void* const, eprosima::fastdds::dds::DataRepresentationId_t) { - uint32_t size = m_typeSize; - return [size]() -> uint32_t - { - return size; - }; + return max_serialized_type_size; } -void* LatencyDataType::createData() +void* LatencyDataType::create_data() { - return (void*)new uint8_t[m_typeSize]; + return (void*)new uint8_t[max_serialized_type_size]; } -void LatencyDataType::deleteData( +void LatencyDataType::delete_data( void* data) { delete[] (uint8_t*)(data); @@ -133,27 +129,24 @@ bool TestCommandDataType::deserialize( return true; } -std::function TestCommandDataType::getSerializedSizeProvider( +uint32_t TestCommandDataType::calculate_serialized_size( const void* const, eprosima::fastdds::dds::DataRepresentationId_t) { - return []() -> uint32_t - { - uint32_t size = 0; + uint32_t size = 0; - size = (uint32_t)sizeof(uint32_t); + size = (uint32_t)sizeof(uint32_t); - return size; - }; + return size; } -void* TestCommandDataType::createData() +void* TestCommandDataType::create_data() { return (void*)new TestCommandType(); } -void TestCommandDataType::deleteData( +void TestCommandDataType::delete_data( void* data) { diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index a88679078a8..2a09bbe8b04 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -83,21 +83,21 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType LatencyDataType() : buffer_size_(MAX_TYPE_SIZE - LatencyType::overhead) { - setName("LatencyType"); - m_typeSize = MAX_TYPE_SIZE; - m_isGetKeyDefined = false; + set_name("LatencyType"); + max_serialized_type_size = MAX_TYPE_SIZE; + is_compute_key_provided = false; } LatencyDataType( const size_t& size) : buffer_size_(size) { - setName("LatencyType"); - m_typeSize = sizeof(decltype(LatencyType::seqnum)) + + set_name("LatencyType"); + max_serialized_type_size = sizeof(decltype(LatencyType::seqnum)) + sizeof(decltype(LatencyType::bounce)) + ((size + 3) & ~3) + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; - m_isGetKeyDefined = false; + is_compute_key_provided = false; } ~LatencyDataType() @@ -112,13 +112,13 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData() override; - void deleteData( + void* create_data() override; + void delete_data( void* data) override; - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override @@ -187,9 +187,9 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType TestCommandDataType() { - setName("TestCommandType"); - m_typeSize = 4; - m_isGetKeyDefined = false; + set_name("TestCommandType"); + max_serialized_type_size = 4; + is_compute_key_provided = false; } ~TestCommandDataType() @@ -204,13 +204,13 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData() override; - void deleteData( + void* create_data() override; + void delete_data( void* data) override; - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override diff --git a/test/performance/throughput/ThroughputPublisher.cpp b/test/performance/throughput/ThroughputPublisher.cpp index de5724e0b1d..ace865f662d 100644 --- a/test/performance/throughput/ThroughputPublisher.cpp +++ b/test/performance/throughput/ThroughputPublisher.cpp @@ -549,7 +549,7 @@ void ThroughputPublisher::run( { assert(nullptr == dynamic_data_); // Create the data sample - dynamic_data_ = static_cast(dynamic_pub_sub_type_->createData()); + dynamic_data_ = static_cast(dynamic_pub_sub_type_->create_data()); if (nullptr == dynamic_data_) { diff --git a/test/performance/throughput/ThroughputSubscriber.cpp b/test/performance/throughput/ThroughputSubscriber.cpp index 6648c643b5a..be1d00ab352 100644 --- a/test/performance/throughput/ThroughputSubscriber.cpp +++ b/test/performance/throughput/ThroughputSubscriber.cpp @@ -558,7 +558,7 @@ int ThroughputSubscriber::process_message() // Create the data sample dynamic_data_ = - static_cast(dynamic_pub_sub_type_->createData()); + static_cast(dynamic_pub_sub_type_->create_data()); if (nullptr == dynamic_data_) { diff --git a/test/performance/throughput/ThroughputTypes.cpp b/test/performance/throughput/ThroughputTypes.cpp index 2a5ece392e4..73614f63b46 100644 --- a/test/performance/throughput/ThroughputTypes.cpp +++ b/test/performance/throughput/ThroughputTypes.cpp @@ -55,7 +55,7 @@ bool ThroughputDataType::serialize( memcpy(ser_data, <->seqnum, sizeof(lt->seqnum)); ser_data += sizeof(lt->seqnum); memcpy(ser_data, lt->data, buffer_size_); - payload->length = m_typeSize; + payload->length = max_serialized_type_size; return true; } @@ -75,24 +75,20 @@ bool ThroughputDataType::deserialize( return true; } -std::function ThroughputDataType::getSerializedSizeProvider( +uint32_t ThroughputDataType::calculate_serialized_size( const void* const, eprosima::fastdds::dds::DataRepresentationId_t) { // uint32_t seqnum + uint32_t buffer_size_ + actual data - uint32_t size = m_typeSize; - return [size]() -> uint32_t - { - return size; - }; + return max_serialized_type_size; } -void* ThroughputDataType::createData() +void* ThroughputDataType::create_data() { - return (void*)new uint8_t[m_typeSize]; + return (void*)new uint8_t[max_serialized_type_size]; } -void ThroughputDataType::deleteData( +void ThroughputDataType::delete_data( void* data) { delete[] (uint8_t*)(data); @@ -148,27 +144,24 @@ bool ThroughputCommandDataType::deserialize( return true; } -std::function ThroughputCommandDataType::getSerializedSizeProvider( +uint32_t ThroughputCommandDataType::calculate_serialized_size( const void* const, eprosima::fastdds::dds::DataRepresentationId_t) { - return []() -> uint32_t - { - uint32_t size = 0; + uint32_t size = 0; - size = (uint32_t)(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + - sizeof(uint64_t) + sizeof(uint64_t) + sizeof(uint64_t)); + size = (uint32_t)(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) + + sizeof(uint64_t) + sizeof(uint64_t) + sizeof(uint64_t)); - return size; - }; + return size; } -void* ThroughputCommandDataType::createData() +void* ThroughputCommandDataType::create_data() { return (void*)new ThroughputCommandType(); } -void ThroughputCommandDataType::deleteData( +void ThroughputCommandDataType::delete_data( void* data) { delete((ThroughputCommandType*)data); diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index 7cec8fd08af..9b2ff3abbef 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -125,11 +125,11 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType const uint32_t& size) : buffer_size_(size) { - setName(type_name_.c_str()); - m_typeSize = sizeof(decltype(ThroughputType::seqnum)) + + set_name(type_name_.c_str()); + max_serialized_type_size = sizeof(decltype(ThroughputType::seqnum)) + ((size + 3) & ~3) + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; - m_isGetKeyDefined = false; + is_compute_key_provided = false; } ~ThroughputDataType() @@ -145,16 +145,16 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData() override; + void* create_data() override; - void deleteData( + void delete_data( void* data) override; - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override @@ -244,9 +244,9 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType ThroughputCommandDataType() { - setName("ThroughputCommand"); - m_typeSize = 4 * sizeof(uint32_t) + 3 * sizeof(uint64_t) + sizeof(double); - m_isGetKeyDefined = false; + set_name("ThroughputCommand"); + max_serialized_type_size = 4 * sizeof(uint32_t) + 3 * sizeof(uint64_t) + sizeof(double); + is_compute_key_provided = false; } ~ThroughputCommandDataType() @@ -262,16 +262,16 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData() override; + void* create_data() override; - void deleteData( + void delete_data( void* data) override; - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override diff --git a/test/profiling/MemoryTestTypes.cpp b/test/profiling/MemoryTestTypes.cpp index 94289f0e94f..f5ef4bc8786 100644 --- a/test/profiling/MemoryTestTypes.cpp +++ b/test/profiling/MemoryTestTypes.cpp @@ -49,28 +49,25 @@ bool MemoryDataType::deserialize( return true; } -std::function MemoryDataType::getSerializedSizeProvider( +uint32_t MemoryDataType::calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t) { - return [data]() -> uint32_t - { - const MemoryType* tdata = static_cast(data); - uint32_t size = 0; + const MemoryType* tdata = static_cast(data); + uint32_t size = 0; - size = static_cast(sizeof(uint32_t) + sizeof(uint32_t) + tdata->data.size()); + size = static_cast(sizeof(uint32_t) + sizeof(uint32_t) + tdata->data.size()); - return size; - }; + return size; } -void* MemoryDataType::createData() +void* MemoryDataType::create_data() { return static_cast(new MemoryType()); } -void MemoryDataType::deleteData( +void MemoryDataType::delete_data( void* data) { @@ -97,27 +94,24 @@ bool TestCommandDataType::deserialize( return true; } -std::function TestCommandDataType::getSerializedSizeProvider( +uint32_t TestCommandDataType::calculate_serialized_size( const void* const, eprosima::fastdds::dds::DataRepresentationId_t) { - return []() -> uint32_t - { - uint32_t size = 0; + uint32_t size = 0; - size = static_cast(sizeof(uint32_t)); + size = static_cast(sizeof(uint32_t)); - return size; - }; + return size; } -void* TestCommandDataType::createData() +void* TestCommandDataType::create_data() { return static_cast(new TestCommandType()); } -void TestCommandDataType::deleteData( +void TestCommandDataType::delete_data( void* data) { diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index cad92d0795f..f042872cc36 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -80,9 +80,9 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType MemoryDataType() { - setName("MemoryType"); - m_typeSize = 17000; - m_isGetKeyDefined = false; + set_name("MemoryType"); + max_serialized_type_size = 17000; + is_compute_key_provided = false; } ~MemoryDataType() @@ -96,13 +96,13 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData(); - void deleteData( - void* data); - bool getKey( + void* create_data() override; + void delete_data( + void* data) override; + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override @@ -144,9 +144,9 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType TestCommandDataType() { - setName("TestCommandType"); - m_typeSize = 4; - m_isGetKeyDefined = false; + set_name("TestCommandType"); + max_serialized_type_size = 4; + is_compute_key_provided = false; } ~TestCommandDataType() @@ -160,13 +160,13 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool deserialize( eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - void* createData(); - void deleteData( - void* data); - bool getKey( + void* create_data() override; + void delete_data( + void* data) override; + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx index 6d98c6d2bf2..d6a8d5443a9 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AllocTestTypePubSubType::AllocTestTypePubSubType() { - setName("AllocTestType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AllocTestType::getMaxCdrSerializedSize()); -#else - AllocTestType_max_cdr_typesize; -#endif + set_name("AllocTestType"); + uint32_t type_size = AllocTestType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AllocTestType_max_key_cdr_typesize > 16 ? AllocTestType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AllocTestType_max_key_cdr_typesize > 16 ? AllocTestType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AllocTestTypePubSubType::~AllocTestTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool AllocTestTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool AllocTestTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool AllocTestTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool AllocTestTypePubSubType::deserialize( return true; } -std::function AllocTestTypePubSubType::getSerializedSizeProvider( +uint32_t AllocTestTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* AllocTestTypePubSubType::createData() +void* AllocTestTypePubSubType::create_data() { return reinterpret_cast(new AllocTestType()); } -void AllocTestTypePubSubType::deleteData( +void AllocTestTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AllocTestTypePubSubType::getKey( +bool AllocTestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool AllocTestTypePubSubType::getKey( const AllocTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AllocTestType_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 || AllocTestType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index ccec06cc82e..d191b6e7af7 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -61,18 +61,18 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index 7d32c15e502..c6dac70cbb2 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -92,8 +92,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -111,27 +111,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -141,7 +138,7 @@ class TopicDataTypeMock : public TopicDataType void clearName() { - setName(""); + set_name(""); } }; @@ -153,8 +150,8 @@ class LoanableTopicDataTypeMock : public TopicDataType LoanableTopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("loanablefootype"); + max_serialized_type_size = 4u; + set_name("loanablefootype"); } bool serialize( @@ -172,22 +169,19 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } @@ -203,7 +197,7 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -3264,7 +3258,7 @@ TEST(ParticipantTests, DeleteContainedEntities) InstanceHandle_t handle_nil = HANDLE_NIL; BarType data; data.index(1); - type.get_key(&data, &handle_nil); + type.compute_key(&data, &handle_nil); TypeSupport loanable_type(new LoanableTopicDataTypeMock()); loanable_type.register_type(participant); diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index b79be805db0..9c03ebf099b 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -89,8 +89,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -108,27 +108,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -180,9 +177,9 @@ class InstanceTopicDataTypeMock : public TopicDataType InstanceTopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - m_isGetKeyDefined = true; - setName("instancefootype"); + max_serialized_type_size = 4u; + is_compute_key_provided = true; + set_name("instancefootype"); } bool serialize( @@ -200,27 +197,24 @@ class InstanceTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* ihandle, bool /*force_md5*/) override @@ -240,8 +234,8 @@ class BoundedTopicDataTypeMock : public TopicDataType BoundedTopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("bounded_footype"); + max_serialized_type_size = 4u; + set_name("bounded_footype"); } bool serialize( @@ -259,24 +253,24 @@ class BoundedTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return std::function(); + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -1028,7 +1022,7 @@ TEST(DataWriterTests, UnregisterInstance) // 7. Calling unregister_instance with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write(&data, HANDLE_NIL)); - instance_type.get_key(&data, &handle); + instance_type->compute_key(&data, &handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->unregister_instance(&data, handle)); // TODO(jlbueno) There are other possible errors sending the unregister message: RETCODE_OUT_OF_RESOURCES, @@ -1083,7 +1077,7 @@ TEST(DataWriterTests, UnregisterInstanceWithTimestamp) // 7. Calling unregister_instance with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - instance_type.get_key(&data, &handle); + instance_type.compute_key(&data, &handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->unregister_instance_w_timestamp(&data, handle, ts)); // 8. Check invalid timestamps @@ -1142,7 +1136,7 @@ TEST(DataWriterTests, Dispose) // 7. Calling dispose with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write(&data, HANDLE_NIL)); - instance_type.get_key(&data, &handle); + instance_type.compute_key(&data, &handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->dispose(&data, handle)); // TODO(jlbueno) There are other possible errors sending the dispose message: RETCODE_OUT_OF_RESOURCES, @@ -1194,7 +1188,7 @@ TEST(DataWriterTests, DisposeWithTimestamp) // 7. Calling dispose with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - instance_type.get_key(&data, &handle); + instance_type.compute_key(&data, &handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->dispose_w_timestamp(&data, handle, ts)); // 8. Check invalid timestamps @@ -1282,8 +1276,8 @@ class LoanableTypeSupport : public TopicDataType LoanableTypeSupport() : TopicDataType() { - m_typeSize = 4u + sizeof(LoanableType); - setName("LoanableType"); + max_serialized_type_size = 4u + sizeof(LoanableType); + set_name("LoanableType"); } bool serialize( @@ -1301,27 +1295,24 @@ class LoanableTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return [this]() - { - return m_typeSize; - }; + return max_serialized_type_size; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -1485,15 +1476,15 @@ TEST(DataWriterTests, LoanNegativeTests) ASSERT_EQ(datawriter->get_status_mask(), StatusMask::all()); void* sample = nullptr; - auto original_type_size = type_support->m_typeSize; + auto original_type_size = type_support->max_serialized_type_size; // Check for illegal operation type_support->is_plain_result = false; EXPECT_EQ(RETCODE_ILLEGAL_OPERATION, datawriter->loan_sample(sample)); type_support->is_plain_result = true; - type_support->m_typeSize = 0; + type_support->max_serialized_type_size = 0; EXPECT_EQ(RETCODE_ILLEGAL_OPERATION, datawriter->loan_sample(sample)); - type_support->m_typeSize = original_type_size; + type_support->max_serialized_type_size = original_type_size; // Check for not enabled EXPECT_EQ(RETCODE_NOT_ENABLED, datawriter->loan_sample(sample)); @@ -1618,7 +1609,7 @@ TEST(DataWriterTests, InstanceWaitForAcknowledgement) // Expectations EXPECT_CALL(*history, wait_for_acknowledgement_last_change(_, _, _)).WillOnce(testing::Return(true)); - instance_type.get_key(&data, &handle); + instance_type.compute_key(&data, &handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->wait_for_acknowledgments(&data, handle, max_wait)); // 7. Calling wait_for_acknowledgments in a keyed topic with a known handle timeouts if some reader has not @@ -1869,7 +1860,7 @@ TEST(DataWriterTests, InstancePolicyAllocationConsistencyKeyed) type.register_type(participant); // This test pretends to use topic with instances, so the following flag is set. - type.get()->m_isGetKeyDefined = true; + type.get()->is_compute_key_provided = true; Topic* topic = participant->create_topic("footopic", type.get_type_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(topic, nullptr); diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index fa5b46d4637..aa27f7b592c 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -40,8 +40,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -59,27 +59,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -96,8 +93,8 @@ class LoanableTopicDataTypeMock : public TopicDataType LoanableTopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("loanablefootype"); + max_serialized_type_size = 4u; + set_name("loanablefootype"); } bool serialize( @@ -115,19 +112,19 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return std::function(); + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } @@ -143,7 +140,7 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index 4fb6154c979..c26e27caaea 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -491,8 +491,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -510,27 +510,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -540,7 +537,7 @@ class TopicDataTypeMock : public TopicDataType private: - using TopicDataType::getSerializedSizeProvider; + using TopicDataType::calculate_serialized_size; using TopicDataType::serialize; }; diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 4b6969c3e14..428fb1dd0c6 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -28,17 +28,17 @@ class TestType : public TopicDataType void* data), (override)); - MOCK_METHOD(std::function, getSerializedSizeProvider, ( + MOCK_METHOD(uint32_t, calculate_serialized_size, ( const void* const data, DataRepresentationId_t data_representation), (override)); - MOCK_METHOD(void*, createData, (), (override)); + MOCK_METHOD(void*, create_data, (), (override)); - MOCK_METHOD(void, deleteData, ( + MOCK_METHOD(void, delete_data, ( void* data), (override)); - MOCK_METHOD(bool, getKey, ( + MOCK_METHOD(bool, compute_key, ( const void* const data, eprosima::fastdds::dds::InstanceHandle_t* ihandle, bool), @@ -127,11 +127,11 @@ TEST(DataReaderHistory, exclusive_ownership_keyed_sample_reception) { TestType* type_ = new TestType(); // These functions was called due to the type is keyed. - EXPECT_CALL(*type_, createData()).Times(1); - EXPECT_CALL(*type_, deleteData(nullptr)).Times(1); + EXPECT_CALL(*type_, create_data()).Times(1); + EXPECT_CALL(*type_, delete_data(nullptr)).Times(1); const TypeSupport type(type_); - type->m_isGetKeyDefined = true; + type->is_compute_key_provided = true; const Topic topic("test", "test"); DataReaderQos qos; qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS; diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index 2eb90bebf2f..f6fdbbd8231 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -171,10 +171,10 @@ class DataReaderTests : public ::testing::Test FooType data; data.index(0); - type_.get_key(&data, &handle_ok_); + type_.compute_key(&data, &handle_ok_); data.index(2); - type_.get_key(&data, &handle_wrong_); + type_.compute_key(&data, &handle_wrong_); } void reset_lengths_if_ok( @@ -412,7 +412,7 @@ class DataReaderTests : public ::testing::Test // Return code when requesting a correct instance ReturnCode_t instance_ok_code = instance_bad_code; - if (RETCODE_OK == code && type_->m_isGetKeyDefined) + if (RETCODE_OK == code && type_->is_compute_key_provided) { instance_ok_code = code; } @@ -561,7 +561,7 @@ class DataReaderTests : public ::testing::Test basic_read_apis_check(RETCODE_OK, data_reader_, true); // Check with disposed instance - if (type_->m_isGetKeyDefined) + if (type_->is_compute_key_provided) { EXPECT_EQ(RETCODE_OK, data_writer_->dispose(&data, handle_wrong_)); basic_read_apis_check(RETCODE_OK, data_reader_, true); @@ -1798,8 +1798,8 @@ TEST_F(DataReaderTests, sample_info) data_[0].index(1); data_[1].index(2); - type.get_key(&data_[0], &handles_[0]); - type.get_key(&data_[1], &handles_[1]); + type.compute_key(&data_[0], &handles_[0]); + type.compute_key(&data_[1], &handles_[1]); } ~TestState() @@ -2103,7 +2103,7 @@ TEST_F(DataReaderTests, check_read_take_iteration) { // calculate key data.index(i); - type_.get_key(&data, &handles[i]); + type_.compute_key(&data, &handles[i]); // write the index as message oarraystream out(data.message()); @@ -3281,7 +3281,7 @@ TEST_F(DataReaderTests, InstancePolicyAllocationConsistencyNotKeyed) type.register_type(participant); // This test pretends to use topic with no instances, so the following flag is set false. - type.get()->m_isGetKeyDefined = false; + type.get()->is_compute_key_provided = false; Topic* topic = participant->create_topic("footopic", type.get_type_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(topic, nullptr); @@ -3411,7 +3411,7 @@ TEST_F(DataReaderTests, InstancePolicyAllocationConsistencyKeyed) type.register_type(participant); // This test pretends to use topic with instances, so the following flag is set. - type.get()->m_isGetKeyDefined = true; + type.get()->is_compute_key_provided = true; Topic* topic = participant->create_topic("footopic", type.get_type_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(topic, nullptr); @@ -3764,8 +3764,8 @@ class DataRepresentationTestsTypeSupport : public TopicDataType DataRepresentationTestsTypeSupport() : TopicDataType() { - m_typeSize = 4u + sizeof(LoanableType); - setName("LoanableType"); + max_serialized_type_size = 4u + sizeof(LoanableType); + set_name("LoanableType"); } bool serialize( @@ -3783,27 +3783,24 @@ class DataRepresentationTestsTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return [this]() - { - return m_typeSize; - }; + return max_serialized_type_size; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index 8a6d51ec2bc..b8bfdf776ea 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -34,9 +34,9 @@ class FooBoundedTypeSupport : public TopicDataType FooBoundedTypeSupport() : TopicDataType() { - setName("type"); - m_typeSize = 4u + 4u + 4u + 256u; // encapsulation + index + message len + message data - m_isGetKeyDefined = false; + set_name("type"); + max_serialized_type_size = 4u + 4u + 4u + 256u; // encapsulation + index + message len + message data + is_compute_key_provided = false; } bool serialize( @@ -117,30 +117,27 @@ class FooBoundedTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const data, DataRepresentationId_t /*data_representation*/) override { - return [data]() -> uint32_t - { - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; - }; + return static_cast(type::getCdrSerializedSize(*static_cast(data))) + + 4u /*encapsulation*/; } - void* createData() override + void* create_data() override { return static_cast(new type()); } - void deleteData( + void delete_data( void* data) override { type* p_type = static_cast(data); delete p_type; } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*handle*/, bool /*force_md5*/) override diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index 10bdda2b9d4..e6b8b42b700 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -32,9 +32,9 @@ class FooTypeSupport : public TopicDataType FooTypeSupport() : TopicDataType() { - setName("FooType"); - m_typeSize = 4u + 4u + 256u; // encapsulation + index + message - m_isGetKeyDefined = true; + set_name("FooType"); + max_serialized_type_size = 4u + 4u + 256u; // encapsulation + index + message + is_compute_key_provided = true; } bool serialize( @@ -115,29 +115,26 @@ class FooTypeSupport : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return [this] - { - return m_typeSize; - }; + return max_serialized_type_size; } - void* createData() override + void* create_data() override { return static_cast(new FooType()); } - void deleteData( + void delete_data( void* data) override { FooType* p_type = static_cast(data); delete p_type; } - bool getKey( + bool compute_key( const void* const data, fastdds::rtps::InstanceHandle_t* handle, bool force_md5) override diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp index 39d98cba7b7..2a5b89d83da 100644 --- a/test/unittest/dds/subscriber/SubscriberTests.cpp +++ b/test/unittest/dds/subscriber/SubscriberTests.cpp @@ -149,8 +149,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -168,27 +168,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -813,7 +810,7 @@ TEST(SubscriberTests, DeleteContainedEntities) InstanceHandle_t handle_nil = HANDLE_NIL; BarType data; data.index(1); - type.get_key(&data, &handle_nil); + type.compute_key(&data, &handle_nil); EXPECT_EQ(RETCODE_OK, data_writer_foo->write(&data, HANDLE_NIL)); // Wait for data to arrive and check OK should be returned diff --git a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp index 5be4aa2b56c..3c72639d524 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp +++ b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp @@ -679,7 +679,7 @@ class DDSSQLFilterValueGlobalData { static ContentFilterTestTypePubSubType type_support; auto data_ptr = const_cast(&data); - auto data_size = type_support.getSerializedSizeProvider(data_ptr, fastdds::dds::DEFAULT_DATA_REPRESENTATION)(); + auto data_size = type_support.calculate_serialized_size(data_ptr, fastdds::dds::DEFAULT_DATA_REPRESENTATION); auto payload = new IContentFilter::SerializedPayload(data_size); values_.emplace_back(payload); type_support.serialize(data_ptr, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx index a44e2598272..cd34a268186 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StructTypePubSubType::StructTypePubSubType() { - setName("StructType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructType::getMaxCdrSerializedSize()); -#else - StructType_max_cdr_typesize; -#endif + set_name("StructType"); + uint32_t type_size = StructType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructType_max_key_cdr_typesize > 16 ? StructType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructType_max_key_cdr_typesize > 16 ? StructType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructTypePubSubType::~StructTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool StructTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool StructTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool StructTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool StructTypePubSubType::deserialize( return true; } -std::function StructTypePubSubType::getSerializedSizeProvider( +uint32_t StructTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* StructTypePubSubType::createData() +void* StructTypePubSubType::create_data() { return reinterpret_cast(new StructType()); } -void StructTypePubSubType::deleteData( +void StructTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructTypePubSubType::getKey( +bool StructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool StructTypePubSubType::getKey( const StructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructType_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 || StructType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -228,26 +196,21 @@ void StructTypePubSubType::register_type_object_representation() ContentFilterTestTypePubSubType::ContentFilterTestTypePubSubType() { - setName("ContentFilterTestType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ContentFilterTestType::getMaxCdrSerializedSize()); -#else - ContentFilterTestType_max_cdr_typesize; -#endif + set_name("ContentFilterTestType"); + uint32_t type_size = ContentFilterTestType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ContentFilterTestType_max_key_cdr_typesize > 16 ? ContentFilterTestType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ContentFilterTestType_max_key_cdr_typesize > 16 ? ContentFilterTestType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ContentFilterTestTypePubSubType::~ContentFilterTestTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -265,12 +228,10 @@ bool ContentFilterTestTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -285,11 +246,7 @@ bool ContentFilterTestTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -306,11 +263,7 @@ bool ContentFilterTestTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -327,52 +280,43 @@ bool ContentFilterTestTypePubSubType::deserialize( return true; } -std::function ContentFilterTestTypePubSubType::getSerializedSizeProvider( +uint32_t ContentFilterTestTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ContentFilterTestTypePubSubType::createData() +void* ContentFilterTestTypePubSubType::create_data() { return reinterpret_cast(new ContentFilterTestType()); } -void ContentFilterTestTypePubSubType::deleteData( +void ContentFilterTestTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ContentFilterTestTypePubSubType::getKey( +bool ContentFilterTestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -380,35 +324,27 @@ bool ContentFilterTestTypePubSubType::getKey( const ContentFilterTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ContentFilterTestType_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 || ContentFilterTestType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index 1c4d185c594..7cb193968be 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -61,18 +61,18 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -137,18 +137,18 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -183,8 +183,8 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index 64c6bddeda1..991219263cf 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -68,8 +68,8 @@ class TopicDataTypeMock : public TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -87,27 +87,24 @@ class TopicDataTypeMock : public TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -117,7 +114,7 @@ class TopicDataTypeMock : public TopicDataType private: - using TopicDataType::getSerializedSizeProvider; + using TopicDataType::calculate_serialized_size; using TopicDataType::serialize; }; @@ -363,7 +360,7 @@ TEST(TopicTests, InstancePolicyAllocationConsistencyKeyed) type.register_type(participant); // This test pretends to use topic with instances, so the following flag is set. - type.get()->m_isGetKeyDefined = true; + type.get()->is_compute_key_provided = true; // Next QoS config checks the default qos configuration, // create_topic() should not return nullptr. diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx index fdc299c75e4..ff7386f3a5c 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; PrimitivesStructPubSubType::PrimitivesStructPubSubType() { - setName("PrimitivesStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PrimitivesStruct::getMaxCdrSerializedSize()); -#else - PrimitivesStruct_max_cdr_typesize; -#endif + set_name("PrimitivesStruct"); + uint32_t type_size = PrimitivesStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = PrimitivesStruct_max_key_cdr_typesize > 16 ? PrimitivesStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = PrimitivesStruct_max_key_cdr_typesize > 16 ? PrimitivesStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PrimitivesStructPubSubType::~PrimitivesStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool PrimitivesStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool PrimitivesStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool PrimitivesStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,43 @@ bool PrimitivesStructPubSubType::deserialize( return true; } -std::function PrimitivesStructPubSubType::getSerializedSizeProvider( +uint32_t PrimitivesStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* PrimitivesStructPubSubType::createData() +void* PrimitivesStructPubSubType::create_data() { return reinterpret_cast(new PrimitivesStruct()); } -void PrimitivesStructPubSubType::deleteData( +void PrimitivesStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PrimitivesStructPubSubType::getKey( +bool PrimitivesStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +161,27 @@ bool PrimitivesStructPubSubType::getKey( const PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), PrimitivesStruct_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 || PrimitivesStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -235,26 +203,21 @@ void PrimitivesStructPubSubType::register_type_object_representation() AllStructPubSubType::AllStructPubSubType() { - setName("AllStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AllStruct::getMaxCdrSerializedSize()); -#else - AllStruct_max_cdr_typesize; -#endif + set_name("AllStruct"); + uint32_t type_size = AllStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AllStruct_max_key_cdr_typesize > 16 ? AllStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AllStruct_max_key_cdr_typesize > 16 ? AllStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AllStructPubSubType::~AllStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -272,12 +235,10 @@ bool AllStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -292,11 +253,7 @@ bool AllStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -313,11 +270,7 @@ bool AllStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -334,52 +287,43 @@ bool AllStructPubSubType::deserialize( return true; } -std::function AllStructPubSubType::getSerializedSizeProvider( +uint32_t AllStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* AllStructPubSubType::createData() +void* AllStructPubSubType::create_data() { return reinterpret_cast(new AllStruct()); } -void AllStructPubSubType::deleteData( +void AllStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AllStructPubSubType::getKey( +bool AllStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -387,35 +331,27 @@ bool AllStructPubSubType::getKey( const AllStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AllStruct_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 || AllStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -428,26 +364,21 @@ void AllStructPubSubType::register_type_object_representation() ComprehensiveTypePubSubType::ComprehensiveTypePubSubType() { - setName("ComprehensiveType"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ComprehensiveType::getMaxCdrSerializedSize()); -#else - ComprehensiveType_max_cdr_typesize; -#endif + set_name("ComprehensiveType"); + uint32_t type_size = ComprehensiveType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ComprehensiveType_max_key_cdr_typesize > 16 ? ComprehensiveType_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ComprehensiveType_max_key_cdr_typesize > 16 ? ComprehensiveType_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ComprehensiveTypePubSubType::~ComprehensiveTypePubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -465,12 +396,10 @@ bool ComprehensiveTypePubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -485,11 +414,7 @@ bool ComprehensiveTypePubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -506,11 +431,7 @@ bool ComprehensiveTypePubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -527,52 +448,43 @@ bool ComprehensiveTypePubSubType::deserialize( return true; } -std::function ComprehensiveTypePubSubType::getSerializedSizeProvider( +uint32_t ComprehensiveTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ComprehensiveTypePubSubType::createData() +void* ComprehensiveTypePubSubType::create_data() { return reinterpret_cast(new ComprehensiveType()); } -void ComprehensiveTypePubSubType::deleteData( +void ComprehensiveTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ComprehensiveTypePubSubType::getKey( +bool ComprehensiveTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -580,35 +492,27 @@ bool ComprehensiveTypePubSubType::getKey( const ComprehensiveType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ComprehensiveType_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 || ComprehensiveType_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index 9cde8a22627..d966188f875 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -61,18 +61,18 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -107,8 +107,8 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -144,18 +144,18 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -190,8 +190,8 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -218,18 +218,18 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -264,8 +264,8 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/implementation/ComprehensiveTypeImpl.cpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/implementation/ComprehensiveTypeImpl.cpp index 7b0fc369d98..dfa08fc7503 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/implementation/ComprehensiveTypeImpl.cpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/implementation/ComprehensiveTypeImpl.cpp @@ -232,7 +232,7 @@ template <> traits::ref_type create_dynamic_type() { eprosima::fastdds::dds::TypeSupport type(new ComprehensiveTypePubSubType()); - const auto type_name = type->getName(); + const auto type_name = type->get_name(); type->register_type_object_representation(); diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp index 25242104541..9914973e2cc 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp @@ -37,8 +37,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType TopicDataTypeMock() : TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -56,27 +56,24 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, eprosima::fastdds::dds::DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -86,12 +83,12 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType void clearName() { - setName(""); + set_name(""); } private: - using eprosima::fastdds::dds::TopicDataType::getSerializedSizeProvider; + using eprosima::fastdds::dds::TopicDataType::calculate_serialized_size; using eprosima::fastdds::dds::TopicDataType::serialize; }; diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index f2752529427..6f09f92d1a0 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -82,8 +82,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType TopicDataTypeMock() : eprosima::fastdds::dds::TopicDataType() { - m_typeSize = 4u; - setName("footype"); + max_serialized_type_size = 4u; + set_name("footype"); } bool serialize( @@ -101,27 +101,24 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType return true; } - std::function getSerializedSizeProvider( + uint32_t calculate_serialized_size( const void* const /*data*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { - return []()->uint32_t - { - return 0; - }; + return 0; } - void* createData() override + void* create_data() override { return nullptr; } - void deleteData( + void delete_data( void* /*data*/) override { } - bool getKey( + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override @@ -131,7 +128,7 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType private: - using eprosima::fastdds::dds::TopicDataType::getSerializedSizeProvider; + using eprosima::fastdds::dds::TopicDataType::calculate_serialized_size; using eprosima::fastdds::dds::TopicDataType::serialize; }; @@ -610,7 +607,7 @@ TEST_F(StatisticsDomainParticipantTests, EnableStatisticsDataWriterFailureIncomp eprosima::fastdds::dds::TypeSupport count_type(new EntityCountPubSubType); eprosima::fastdds::dds::TypeSupport null_type(nullptr); eprosima::fastdds::dds::TypeSupport invalid_type(new TopicDataTypeMock); - invalid_type->setName(reserved_statistics_type_name); + invalid_type->set_name(reserved_statistics_type_name); participant->register_type(invalid_type); participant->register_type(physical_data_type); @@ -684,9 +681,9 @@ TEST_F(StatisticsDomainParticipantTests, EnableStatisticsDataWriterFailureIncomp // Create topic eprosima::fastdds::dds::Topic* invalid_topic = participant->create_topic(HISTORY_LATENCY_TOPIC, - count_type->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); - participant->create_topic(HEARTBEAT_COUNT_TOPIC, count_type->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); - participant->create_topic(PHYSICAL_DATA_TOPIC, physical_data_type->getName(), + count_type->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + participant->create_topic(HEARTBEAT_COUNT_TOPIC, count_type->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + participant->create_topic(PHYSICAL_DATA_TOPIC, physical_data_type->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); // 2. Check call to enable_statistics_datawriter @@ -746,7 +743,7 @@ TEST_F(StatisticsDomainParticipantTests, DeleteParticipantAfterDeleteContainedEn // 2. Create a sample topic participant->create_topic(HEARTBEAT_COUNT_TOPIC, - count_type->getName(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); + count_type->get_name(), eprosima::fastdds::dds::TOPIC_QOS_DEFAULT); DomainParticipant* statistics_participant = DomainParticipant::narrow(participant); ASSERT_NE(statistics_participant, nullptr); From addb202c1bf8eb96f513b1fb011dc779cee6c4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Fri, 12 Jul 2024 13:05:22 +0200 Subject: [PATCH 03/14] Refs #21349. Rename GEN_API_VER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- examples/cpp/configuration/ConfigurationPubSubTypes.hpp | 4 ++-- examples/cpp/content_filter/HelloWorldPubSubTypes.hpp | 4 ++-- .../cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp | 4 ++-- .../HelloWorldPubSubTypes.hpp | 4 ++-- .../HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp | 4 ++-- .../dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp | 4 ++-- examples/cpp/dds/Keys/samplePubSubTypes.hpp | 4 ++-- .../WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp | 4 ++-- .../dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp | 4 ++-- .../delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp | 4 ++-- examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp | 4 ++-- examples/cpp/flow_control/FlowControlPubSubTypes.hpp | 8 ++++---- examples/cpp/hello_world/HelloWorldPubSubTypes.hpp | 4 ++-- .../cpp/request_reply/types/CalculatorPubSubTypes.hpp | 4 ++-- examples/cpp/security/HelloWorldPubSubTypes.hpp | 4 ++-- .../cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp | 4 ++-- include/fastdds/config.hpp.in | 2 +- .../detail/dds_xtypes_typeobjectPubSubTypes.hpp | 4 ++-- .../detail/TypeLookupTypesPubSubTypes.hpp | 4 ++-- .../type_lookup_service/detail/rpc_typesPubSubTypes.hpp | 4 ++-- .../statistics/types/monitorservice_typesPubSubTypes.hpp | 4 ++-- src/cpp/statistics/types/typesPubSubTypes.hpp | 4 ++-- test/blackbox/types/Data1mbPubSubTypes.hpp | 4 ++-- test/blackbox/types/Data64kbPubSubTypes.hpp | 4 ++-- test/blackbox/types/FixedSizedPubSubTypes.hpp | 4 ++-- test/blackbox/types/HelloWorldPubSubTypes.hpp | 4 ++-- test/blackbox/types/KeyedData1mbPubSubTypes.hpp | 4 ++-- test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp | 4 ++-- test/blackbox/types/StringTestPubSubTypes.hpp | 4 ++-- .../types/TestIncludeRegression3361PubSubTypes.hpp | 4 ++-- test/blackbox/types/TestRegression3361PubSubTypes.hpp | 4 ++-- test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp | 4 ++-- test/blackbox/types/core/core_typesPubSubTypes.hpp | 4 ++-- .../types/statistics/monitorservice_typesPubSubTypes.hpp | 4 ++-- test/blackbox/types/statistics/typesPubSubTypes.hpp | 4 ++-- test/dds-types-test/aliasesPubSubTypes.hpp | 4 ++-- test/dds-types-test/annotationsPubSubTypes.hpp | 4 ++-- test/dds-types-test/appendablePubSubTypes.hpp | 4 ++-- test/dds-types-test/arraysPubSubTypes.hpp | 4 ++-- test/dds-types-test/bitsetsPubSubTypes.hpp | 4 ++-- test/dds-types-test/constantsPubSubTypes.hpp | 4 ++-- test/dds-types-test/declarationsPubSubTypes.hpp | 4 ++-- test/dds-types-test/enumerationsPubSubTypes.hpp | 4 ++-- test/dds-types-test/externalPubSubTypes.hpp | 4 ++-- test/dds-types-test/finalPubSubTypes.hpp | 4 ++-- .../helpers/basic_inner_typesPubSubTypes.hpp | 4 ++-- test/dds-types-test/inheritancePubSubTypes.hpp | 4 ++-- test/dds-types-test/keyPubSubTypes.hpp | 4 ++-- test/dds-types-test/mapsPubSubTypes.hpp | 4 ++-- test/dds-types-test/member_idPubSubTypes.hpp | 4 ++-- test/dds-types-test/mutablePubSubTypes.hpp | 4 ++-- test/dds-types-test/optionalPubSubTypes.hpp | 4 ++-- test/dds-types-test/primitivesPubSubTypes.hpp | 4 ++-- test/dds-types-test/relative_path_includePubSubTypes.hpp | 4 ++-- test/dds-types-test/sequencesPubSubTypes.hpp | 4 ++-- test/dds-types-test/stringsPubSubTypes.hpp | 4 ++-- test/dds-types-test/structuresPubSubTypes.hpp | 4 ++-- test/dds-types-test/unionsPubSubTypes.hpp | 4 ++-- test/profiling/allocations/AllocTestTypePubSubTypes.hpp | 4 ++-- .../data_types/ContentFilterTestTypePubSubTypes.hpp | 4 ++-- .../gen/ComprehensiveTypePubSubTypes.hpp | 4 ++-- 61 files changed, 123 insertions(+), 123 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index af9c04c5059..60907846c32 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "Configuration.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated Configuration is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index 4fe2ea7a1ce..cad0a73be41 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index 3d5dd477f7f..2c1050a3581 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -32,10 +32,10 @@ #include "sample.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated sample is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index c6acedce0b8..4625bd824c9 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "LoanableHelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated LoanableHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index c6acedce0b8..4625bd824c9 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "LoanableHelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated LoanableHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 14c2530f450..7dad386c8cb 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "DeliveryMechanisms.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated DeliveryMechanisms is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index d6157290bfe..69eee15e929 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "FlowControl.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ - Generated FlowControl is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER + Generated FlowControlExample is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. +#endif // FASTDDS_GEN_API_VER /*! @@ -89,7 +89,7 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override { static_cast(data_representation); return false; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index ad2dd286d13..d2cd577efaf 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "Calculator.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated Calculator is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index 7d0e16649d7..9c160fbfec4 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/include/fastdds/config.hpp.in b/include/fastdds/config.hpp.in index 508897f88e6..eb65636c8f3 100644 --- a/include/fastdds/config.hpp.in +++ b/include/fastdds/config.hpp.in @@ -20,7 +20,7 @@ #define FASTDDS_VERSION_MICRO @PROJECT_VERSION_PATCH@ #define FASTDDS_VERSION_STR "@PROJECT_VERSION@" -#define GEN_API_VER 2 +#define FASTDDS_GEN_API_VER 3 // C++20 support defines #ifndef HAVE_CXX20 diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index 3bd89426f2e..a537a5b2acf 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "dds_xtypes_typeobject.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated dds_xtypes_typeobject is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index e54d2c46bfe..19facb626a3 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -35,10 +35,10 @@ #include #include -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated TypeLookupTypes is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index d5108db1235..f1346012747 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "rpc_types.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated rpc_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index 92123608850..356ca50f5b1 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index bec7ad3b50b..8a89f861c90 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "types.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index 932ca265e21..f8b1b2fcbfb 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "Data1mb.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated Data1mb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index 0c6697bbbc3..f543214a8f5 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "Data64kb.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated Data64kb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index f40a57fdfd5..01d0ce82eed 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "FixedSized.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated FixedSized is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index 4fe2ea7a1ce..cad0a73be41 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "HelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index 82b9e3d87f9..714b3a199e9 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "KeyedData1mb.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated KeyedData1mb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index 64813545798..af52501575b 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "KeyedHelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated KeyedHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index 4603505d065..27bad35a6e7 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "StringTest.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated StringTest is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp index 480dd7051fb..6f4e7d9cbb8 100644 --- a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp @@ -32,10 +32,10 @@ #include "TestIncludeRegression3361.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated TestIncludeRegression3361 is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace TestModule { diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index 41d62c61b6f..16fcbb4fa9f 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -33,10 +33,10 @@ #include "TestIncludeRegression3361PubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated TestRegression3361 is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index 1fecf26d245..c55e60c4173 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "UnboundedHelloWorld.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated UnboundedHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index 5ac732a9a1b..8feaf1eded0 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "core_types.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated core_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index 92123608850..356ca50f5b1 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index bec7ad3b50b..8a89f861c90 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "types.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace eprosima { diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index 0e2a7acdbba..94025b8c143 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated aliases is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER typedef int16_t alias_int16; typedef uint16_t alias_uint16; diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index ed32a9effac..c86a3e0e1fb 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated annotations is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index d581d282b5a..632a05dd705 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated appendable is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index 18728296f96..3ead9640ded 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated arrays is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index f0d9b4f2ef6..f7c99cf9daa 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated bitsets is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index e2969ef36f5..ac6531cd533 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated constants is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER typedef int16_t alias_short; diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index c7bb8d9ac7d..79b5028d0ee 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "declarations.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated declarations is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER typedef std::vector RecursiveUnboundedSeqForwardStruct; typedef std::vector RecursiveBoundedSeqForwardStruct; diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index 3b25d7b091b..d53a76567bb 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated enumerations is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER namespace Test { diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index 66e2f6bccc4..9b3902b0701 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated external is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index 184eece5fa1..9a5d707d6e8 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated final is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index 7898a291570..b2769206512 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "basic_inner_types.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated basic_inner_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER typedef int32_t InnerAliasHelper; diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index 9628d1f66a4..a4eaba10cb5 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated inheritance is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index 8c53b9f3532..0d7c680e3c5 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "key.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated key is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index bd207b35649..ca3bf395fc2 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated maps is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index e06ad86e246..8a96f9ae770 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "member_id.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated member_id is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index c499d6b82bc..953958bbed1 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated mutable is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index 9c68a5e0230..fb2a8a402c2 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated optional is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index ae33bd73c21..a7d82007ba3 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "primitives.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated primitives is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index b38202694c8..cbe7cff7a8d 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -33,10 +33,10 @@ #include "../IDL/helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated relative_path_include is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index 3631cb4f966..aad1122005b 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated sequences is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index 1b7c048107a..9cedcb69290 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "strings.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated strings is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index 969412d34f0..101c51e8997 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated structures is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index 962abf4b9c2..412c74b39f6 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -33,10 +33,10 @@ #include "helpers/basic_inner_typesPubSubTypes.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated unions is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index d191b6e7af7..6cfc657a7ee 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -32,10 +32,10 @@ #include "AllocTestType.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated AllocTestType is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index 7cb193968be..3305b0a4afd 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -32,10 +32,10 @@ #include "ContentFilterTestType.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated ContentFilterTestType is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index d966188f875..c0014465950 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -32,10 +32,10 @@ #include "ComprehensiveType.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated ComprehensiveType is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! From b267b1cd0046e1982b478d8579a5268a2a7db1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 15 Jul 2024 07:39:43 +0200 Subject: [PATCH 04/14] Refs #21349. Apply suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- include/fastdds/dds/topic/TopicDataType.hpp | 2 +- src/cpp/CMakeLists.txt | 1 - src/cpp/fastdds/publisher/DataWriterImpl.cpp | 22 +++++++++- src/cpp/fastdds/publisher/DataWriterImpl.hpp | 15 +------ src/cpp/fastdds/topic/TopicDataType.cpp | 40 ------------------- test/unittest/dds/publisher/CMakeLists.txt | 1 - test/unittest/dds/status/CMakeLists.txt | 1 - test/unittest/dds/subscriber/CMakeLists.txt | 1 - .../dds/topic/DDSSQLFilter/CMakeLists.txt | 1 - test/unittest/rtps/builtin/CMakeLists.txt | 1 - test/unittest/rtps/discovery/CMakeLists.txt | 2 - test/unittest/rtps/network/CMakeLists.txt | 1 - test/unittest/rtps/reader/CMakeLists.txt | 1 - test/unittest/statistics/dds/CMakeLists.txt | 3 -- test/unittest/statistics/rtps/CMakeLists.txt | 1 - test/unittest/xmlparser/CMakeLists.txt | 4 -- 16 files changed, 22 insertions(+), 75 deletions(-) delete mode 100644 src/cpp/fastdds/topic/TopicDataType.cpp diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index efab5b39316..1bbfedc3eef 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -69,7 +69,7 @@ class TopicDataType /** * @brief Destructor */ - FASTDDS_EXPORTED_API virtual ~TopicDataType(); + FASTDDS_EXPORTED_API virtual ~TopicDataType() = default; /** * Serialize method, it should be implemented by the user, since it is abstract. If not implemented, this method diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 027af6ae514..77ce4af23ba 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -85,7 +85,6 @@ set(${PROJECT_NAME}_source_files fastdds/topic/ContentFilteredTopicImpl.cpp fastdds/topic/qos/TopicQos.cpp fastdds/topic/Topic.cpp - fastdds/topic/TopicDataType.cpp fastdds/topic/TopicImpl.cpp fastdds/topic/TopicProxyFactory.cpp fastdds/topic/TypeSupport.cpp diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index ef521541347..d283f624056 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -1015,8 +1015,9 @@ ReturnCode_t DataWriterImpl::perform_create_new_change( bool was_loaned = check_and_remove_loan(data, payload); if (!was_loaned) { - if (!get_free_payload_from_pool(fixed_payload_size_ ? fixed_payload_size_ : type_->calculate_serialized_size( - data, data_representation_), payload)) + uint32_t payload_size = fixed_payload_size_ ? fixed_payload_size_ : type_->calculate_serialized_size( + data, data_representation_); + if (!get_free_payload_from_pool(payload_size, payload)) { return RETCODE_OUT_OF_RESOURCES; } @@ -2117,6 +2118,23 @@ bool DataWriterImpl::release_payload_pool() return result; } +bool DataWriterImpl::get_free_payload_from_pool( + uint32_t size, + SerializedPayload_t& payload) +{ + if (!payload_pool_) + { + return false; + } + + if (!payload_pool_->get_payload(size, payload)) + { + return false; + } + + return true; +} + bool DataWriterImpl::add_loan( const void* const data, SerializedPayload_t& payload) diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp index 56dc15b25e6..3f0b301f07e 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.hpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.hpp @@ -664,20 +664,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter bool get_free_payload_from_pool( uint32_t size, - SerializedPayload_t& payload) - { - if (!payload_pool_) - { - return false; - } - - if (!payload_pool_->get_payload(size, payload)) - { - return false; - } - - return true; - } + SerializedPayload_t& payload); bool add_loan( const void* const data, diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp deleted file mode 100644 index 6058a4f98b0..00000000000 --- a/src/cpp/fastdds/topic/TopicDataType.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file TopicDataType.cpp - */ - -#include -#include -#include - -#include - -#include -#include -#include -#include - -namespace eprosima { -namespace fastdds { -namespace dds { - -TopicDataType::~TopicDataType() -{ -} - -} /* namespace dds */ -} /* namespace fastdds */ -} /* namespace eprosima */ diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt index 09d7162d0de..0d97d338001 100644 --- a/test/unittest/dds/publisher/CMakeLists.txt +++ b/test/unittest/dds/publisher/CMakeLists.txt @@ -70,7 +70,6 @@ set(DATAWRITERTESTS_SOURCE DataWriterTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/qos/TopicQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/Topic.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp diff --git a/test/unittest/dds/status/CMakeLists.txt b/test/unittest/dds/status/CMakeLists.txt index be2d7bf2916..c46b27a808e 100644 --- a/test/unittest/dds/status/CMakeLists.txt +++ b/test/unittest/dds/status/CMakeLists.txt @@ -50,7 +50,6 @@ set(LISTENERTESTS_SOURCE ListenerTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/qos/TopicQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/Topic.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp diff --git a/test/unittest/dds/subscriber/CMakeLists.txt b/test/unittest/dds/subscriber/CMakeLists.txt index e2264079ca5..5150e36f204 100644 --- a/test/unittest/dds/subscriber/CMakeLists.txt +++ b/test/unittest/dds/subscriber/CMakeLists.txt @@ -25,7 +25,6 @@ set(DATAREADERINSTANCETESTS_SOURCE DataReaderInstanceTests.cpp ) set(DATAREADERHISTORYTESTS_SOURCE DataReaderHistoryTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/SerializedPayload.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp diff --git a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt index d03f8daec6d..596650541d0 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt +++ b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt @@ -21,7 +21,6 @@ file(GLOB DDSSQLFILTER_SOURCES file(GLOB DDSSQLFILTER_LIB_SOURCES ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/*.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/SerializedPayload.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp diff --git a/test/unittest/rtps/builtin/CMakeLists.txt b/test/unittest/rtps/builtin/CMakeLists.txt index a2bc6004d9e..358ce8f234c 100644 --- a/test/unittest/rtps/builtin/CMakeLists.txt +++ b/test/unittest/rtps/builtin/CMakeLists.txt @@ -16,7 +16,6 @@ set(BUILTIN_DATA_SERIALIZATION_TESTS_SOURCE BuiltinDataSerializationTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp diff --git a/test/unittest/rtps/discovery/CMakeLists.txt b/test/unittest/rtps/discovery/CMakeLists.txt index 51721bcbf12..1ef99c89db9 100644 --- a/test/unittest/rtps/discovery/CMakeLists.txt +++ b/test/unittest/rtps/discovery/CMakeLists.txt @@ -16,7 +16,6 @@ set(EDPTESTS_SOURCE EdpTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp @@ -114,7 +113,6 @@ set(PDPTESTS_SOURCE PDPTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp diff --git a/test/unittest/rtps/network/CMakeLists.txt b/test/unittest/rtps/network/CMakeLists.txt index e28cf657a75..ad528dcda57 100644 --- a/test/unittest/rtps/network/CMakeLists.txt +++ b/test/unittest/rtps/network/CMakeLists.txt @@ -107,7 +107,6 @@ add_executable(ExternalLocatorsTests ExternalLocatorsTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp diff --git a/test/unittest/rtps/reader/CMakeLists.txt b/test/unittest/rtps/reader/CMakeLists.txt index 61980797160..09585886e51 100644 --- a/test/unittest/rtps/reader/CMakeLists.txt +++ b/test/unittest/rtps/reader/CMakeLists.txt @@ -289,7 +289,6 @@ set(STATEFUL_READER_TESTS_SOURCE StatefulReaderTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/utils/IPFinder.cpp ${PROJECT_SOURCE_DIR}/src/cpp/utils/IPLocator.cpp diff --git a/test/unittest/statistics/dds/CMakeLists.txt b/test/unittest/statistics/dds/CMakeLists.txt index 5fff5dc79d7..174463c3c5c 100644 --- a/test/unittest/statistics/dds/CMakeLists.txt +++ b/test/unittest/statistics/dds/CMakeLists.txt @@ -80,7 +80,6 @@ if (FASTDDS_STATISTICS) DomainParticipantStatisticsListenerTests.cpp) add_executable(DomainParticipantStatisticsListenerTests - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.cpp ${PROJECT_SOURCE_DIR}/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -172,7 +171,6 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX) ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/qos/TopicQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/Topic.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp @@ -353,7 +351,6 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX) ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/qos/TopicQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/Topic.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicImpl.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicProxyFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TypeSupport.cpp diff --git a/test/unittest/statistics/rtps/CMakeLists.txt b/test/unittest/statistics/rtps/CMakeLists.txt index de69247ee3e..03036f85d9b 100644 --- a/test/unittest/statistics/rtps/CMakeLists.txt +++ b/test/unittest/statistics/rtps/CMakeLists.txt @@ -66,7 +66,6 @@ set(STATISTICS_RTPS_MONITORSERVICETESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/builtin/data/WriterProxyData.cpp diff --git a/test/unittest/xmlparser/CMakeLists.txt b/test/unittest/xmlparser/CMakeLists.txt index 397058bc3ea..d88feab7df0 100644 --- a/test/unittest/xmlparser/CMakeLists.txt +++ b/test/unittest/xmlparser/CMakeLists.txt @@ -80,7 +80,6 @@ set(XMLPROFILEPARSER_SOURCE XMLProfileParserTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp @@ -174,7 +173,6 @@ set(XMLPARSER_SOURCE XMLElementParserTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp @@ -293,7 +291,6 @@ set(XMLENDPOINTPARSERTESTS_SOURCE XMLEndpointParserTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp @@ -378,7 +375,6 @@ set(XMLLOADFILE_SOURCE XMLLoadFileTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp - ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/topic/TopicDataType.cpp ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/xtypes/exception/Exception.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/LocatorWithMask.cpp From a54f440905d5d0f17f36701a8c63a040f07bf0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 15 Jul 2024 12:13:35 +0200 Subject: [PATCH 05/14] Refs #21349. Apply suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../ConfigurationPubSubTypes.cxx | 19 + .../ConfigurationPubSubTypes.hpp | 5 + .../content_filter/HelloWorldPubSubTypes.cxx | 19 + .../content_filter/HelloWorldPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + examples/cpp/dds/Keys/samplePubSubTypes.cxx | 19 + examples/cpp/dds/Keys/samplePubSubTypes.hpp | 5 + .../LoanableHelloWorldPubSubTypes.cxx | 19 + .../LoanableHelloWorldPubSubTypes.hpp | 5 + .../LoanableHelloWorldPubSubTypes.cxx | 19 + .../LoanableHelloWorldPubSubTypes.hpp | 5 + .../DeliveryMechanismsPubSubTypes.cxx | 19 + .../DeliveryMechanismsPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + .../flow_control/FlowControlPubSubTypes.cxx | 19 + .../flow_control/FlowControlPubSubTypes.hpp | 5 + .../cpp/hello_world/HelloWorldPubSubTypes.cxx | 19 + .../cpp/hello_world/HelloWorldPubSubTypes.hpp | 5 + .../types/CalculatorPubSubTypes.cxx | 38 + .../types/CalculatorPubSubTypes.hpp | 10 + .../cpp/security/HelloWorldPubSubTypes.cxx | 19 + .../cpp/security/HelloWorldPubSubTypes.hpp | 5 + .../HelloWorldPubSubTypes.cxx | 19 + .../HelloWorldPubSubTypes.hpp | 5 + include/fastdds/dds/topic/TopicDataType.hpp | 34 +- include/fastdds/dds/topic/TypeSupport.hpp | 6 +- .../dynamic_types/DynamicPubSubType.hpp | 12 + .../dds_xtypes_typeobjectPubSubTypes.hpp | 485 + .../detail/TypeLookupTypesPubSubTypes.cxx | 114 + .../detail/TypeLookupTypesPubSubTypes.hpp | 30 + .../detail/rpc_typesPubSubTypes.cxx | 114 + .../detail/rpc_typesPubSubTypes.hpp | 30 + .../dynamic_types/DynamicPubSubType.cpp | 23 +- .../dds_xtypes_typeobjectPubSubTypes.cxx | 1845 ++- .../types/monitorservice_typesPubSubTypes.cxx | 133 + .../types/monitorservice_typesPubSubTypes.hpp | 35 + src/cpp/statistics/types/typesPubSubTypes.cxx | 266 + src/cpp/statistics/types/typesPubSubTypes.hpp | 70 + .../common/DDSBlackboxTestsFindTopic.cpp | 8 + test/blackbox/types/Data1mbPubSubTypes.cxx | 19 + test/blackbox/types/Data1mbPubSubTypes.hpp | 5 + test/blackbox/types/Data64kbPubSubTypes.cxx | 19 + test/blackbox/types/Data64kbPubSubTypes.hpp | 5 + test/blackbox/types/FixedSizedPubSubTypes.cxx | 19 + test/blackbox/types/FixedSizedPubSubTypes.hpp | 5 + test/blackbox/types/HelloWorldPubSubTypes.cxx | 19 + test/blackbox/types/HelloWorldPubSubTypes.hpp | 5 + .../types/KeyedData1mbPubSubTypes.cxx | 19 + .../types/KeyedData1mbPubSubTypes.hpp | 5 + .../types/KeyedHelloWorldPubSubTypes.cxx | 19 + .../types/KeyedHelloWorldPubSubTypes.hpp | 5 + test/blackbox/types/StringTestPubSubTypes.cxx | 19 + test/blackbox/types/StringTestPubSubTypes.hpp | 5 + .../types/TestRegression3361PubSubTypes.cxx | 19 + .../types/TestRegression3361PubSubTypes.hpp | 5 + .../types/UnboundedHelloWorldPubSubTypes.cxx | 19 + .../types/UnboundedHelloWorldPubSubTypes.hpp | 5 + .../types/core/core_typesPubSubTypes.cxx | 418 + .../types/core/core_typesPubSubTypes.hpp | 110 + .../monitorservice_typesPubSubTypes.cxx | 133 + .../monitorservice_typesPubSubTypes.hpp | 35 + .../types/statistics/typesPubSubTypes.cxx | 266 + .../types/statistics/typesPubSubTypes.hpp | 70 + test/dds-types-test/aliasesPubSubTypes.cxx | 475 + test/dds-types-test/aliasesPubSubTypes.hpp | 125 + .../dds-types-test/annotationsPubSubTypes.cxx | 57 + .../dds-types-test/annotationsPubSubTypes.hpp | 15 + test/dds-types-test/appendablePubSubTypes.cxx | 361 + test/dds-types-test/appendablePubSubTypes.hpp | 95 + test/dds-types-test/arraysPubSubTypes.cxx | 1986 ++- test/dds-types-test/arraysPubSubTypes.hpp | 522 +- test/dds-types-test/bitsetsPubSubTypes.cxx | 19 + test/dds-types-test/bitsetsPubSubTypes.hpp | 5 + test/dds-types-test/constantsPubSubTypes.cxx | 57 + test/dds-types-test/constantsPubSubTypes.hpp | 15 + .../declarationsPubSubTypes.cxx | 114 + .../declarationsPubSubTypes.hpp | 30 + .../enumerationsPubSubTypes.cxx | 57 + .../enumerationsPubSubTypes.hpp | 15 + test/dds-types-test/externalPubSubTypes.cxx | 513 + test/dds-types-test/externalPubSubTypes.hpp | 135 + test/dds-types-test/finalPubSubTypes.cxx | 361 + test/dds-types-test/finalPubSubTypes.hpp | 95 + .../helpers/basic_inner_typesPubSubTypes.cxx | 38 + .../helpers/basic_inner_typesPubSubTypes.hpp | 10 + .../dds-types-test/inheritancePubSubTypes.cxx | 152 + .../dds-types-test/inheritancePubSubTypes.hpp | 40 + test/dds-types-test/keyPubSubTypes.cxx | 323 + test/dds-types-test/keyPubSubTypes.hpp | 85 + test/dds-types-test/mapsPubSubTypes.cxx | 10418 ++++++++++++---- test/dds-types-test/mapsPubSubTypes.hpp | 1310 ++ test/dds-types-test/member_idPubSubTypes.cxx | 228 + test/dds-types-test/member_idPubSubTypes.hpp | 60 + test/dds-types-test/mutablePubSubTypes.cxx | 361 + test/dds-types-test/mutablePubSubTypes.hpp | 95 + test/dds-types-test/optionalPubSubTypes.cxx | 1539 +++ test/dds-types-test/optionalPubSubTypes.hpp | 405 + test/dds-types-test/primitivesPubSubTypes.cxx | 399 + test/dds-types-test/primitivesPubSubTypes.hpp | 105 + .../relative_path_includePubSubTypes.cxx | 19 + .../relative_path_includePubSubTypes.hpp | 5 + test/dds-types-test/sequencesPubSubTypes.cxx | 532 + test/dds-types-test/sequencesPubSubTypes.hpp | 140 + test/dds-types-test/stringsPubSubTypes.cxx | 114 + test/dds-types-test/stringsPubSubTypes.hpp | 30 + test/dds-types-test/structuresPubSubTypes.cxx | 646 + test/dds-types-test/structuresPubSubTypes.hpp | 170 + test/dds-types-test/unionsPubSubTypes.cxx | 779 ++ test/dds-types-test/unionsPubSubTypes.hpp | 205 + test/performance/latency/LatencyTestTypes.hpp | 20 + .../throughput/ThroughputTypes.hpp | 18 + test/profiling/MemoryTestTypes.h | 19 + .../allocations/AllocTestTypePubSubTypes.cxx | 19 + .../allocations/AllocTestTypePubSubTypes.hpp | 5 + .../dds/participant/ParticipantTests.cpp | 16 + .../dds/publisher/DataWriterTests.cpp | 32 + .../unittest/dds/publisher/PublisherTests.cpp | 16 + test/unittest/dds/status/ListenerTests.cpp | 8 + .../dds/subscriber/DataReaderHistoryTests.cpp | 6 + .../dds/subscriber/DataReaderTests.cpp | 8 + .../dds/subscriber/FooBoundedTypeSupport.hpp | 8 + .../dds/subscriber/FooTypeSupport.hpp | 14 + .../dds/subscriber/SubscriberTests.cpp | 8 + .../ContentFilterTestTypePubSubTypes.cxx | 38 + .../ContentFilterTestTypePubSubTypes.hpp | 10 + test/unittest/dds/topic/TopicTests.cpp | 8 + .../gen/ComprehensiveTypePubSubTypes.cxx | 57 + .../gen/ComprehensiveTypePubSubTypes.hpp | 15 + ...sDomainParticipantStatusQueryableTests.cpp | 8 + .../dds/StatisticsDomainParticipantTests.cpp | 8 + 138 files changed, 25725 insertions(+), 2737 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx index 360be5699c8..343ee299b59 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx @@ -148,6 +148,25 @@ void ConfigurationPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ConfigurationPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Configuration data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ConfigurationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index 60907846c32..941f28c2fb3 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -65,6 +65,11 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index cad0a73be41..52686589b0f 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx index 6f4ecc7565a..18e2eed9f84 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx @@ -148,6 +148,25 @@ void samplePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool samplePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sample data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool samplePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index 2c1050a3581..cb8a7c0dde7 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -65,6 +65,11 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx index c59e014cc4d..9577938f8c9 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void LoanableHelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LoanableHelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LoanableHelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LoanableHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index 4625bd824c9..fcc345a615b 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -98,6 +98,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx index c59e014cc4d..9577938f8c9 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void LoanableHelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LoanableHelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LoanableHelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LoanableHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index 4625bd824c9..fcc345a615b 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -98,6 +98,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx index bc67039570a..07ac147c318 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx @@ -148,6 +148,25 @@ void DeliveryMechanismsPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DeliveryMechanismsPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DeliveryMechanisms data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DeliveryMechanismsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 7dad386c8cb..8cba1511851 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -98,6 +98,11 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx index 9af0fbb057b..9909d718444 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx @@ -148,6 +148,25 @@ void FlowControlExamplePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FlowControlExamplePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FlowControlExample data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FlowControlExamplePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index 69eee15e929..d8713e99d6b 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -65,6 +65,11 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx index 43d319889aa..8c58c842b88 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx @@ -148,6 +148,25 @@ void RequestTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool RequestTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + RequestType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool RequestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -310,6 +329,25 @@ void ReplyTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ReplyTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ReplyType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ReplyTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index d2cd577efaf..47e8a137a7e 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -65,6 +65,11 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -139,6 +144,11 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/security/HelloWorldPubSubTypes.cxx b/examples/cpp/security/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/security/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx index fd0272ad93e..9e71be84693 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index 9c160fbfec4..66df48a84cb 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 1bbfedc3eef..3756d6b3919 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -122,6 +122,19 @@ class TopicDataType FASTDDS_EXPORTED_API virtual void delete_data( void* data) = 0; + /** + * Get the key associated with the data. + * + * @param [in] data Pointer to the payload containing the data. + * @param [out] ihandle Pointer to the Handle. + * @param [in] force_md5 Force MD5 checking. + * @return True if correct. + */ + FASTDDS_EXPORTED_API virtual bool compute_key( + fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) = 0; + /** * Get the key associated with the data. * @@ -141,9 +154,20 @@ class TopicDataType * @param nam Topic data type name */ FASTDDS_EXPORTED_API inline void set_name( - const char* nam) + const std::string& nam) { - topic_data_typename_ = std::string(nam); + topic_data_typename_ = nam; + } + + /** + * Set topic data type name + * + * @param nam Topic data type name + */ + FASTDDS_EXPORTED_API inline void set_name( + std::string&& nam) + { + topic_data_typename_ = std::move(nam); } /** @@ -151,9 +175,9 @@ class TopicDataType * * @return Topic data type name */ - FASTDDS_EXPORTED_API inline const char* get_name() const + FASTDDS_EXPORTED_API inline const std::string& get_name() const { - return topic_data_typename_.c_str(); + return topic_data_typename_; } /** @@ -243,8 +267,6 @@ class TopicDataType //TODO(XTypes) bool auto_fill_type_information_ {true}; - friend class fastdds::dds::TypeSupport; - }; } // namespace dds diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index 9396e6b09fc..19debccc4c4 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -128,7 +128,7 @@ class TypeSupport : public std::shared_ptr */ FASTDDS_EXPORTED_API virtual const std::string& get_type_name() const { - return get()->topic_data_typename_; + return get()->get_name(); } /** @@ -219,8 +219,8 @@ class TypeSupport : public std::shared_ptr { return get()->max_serialized_type_size == type_support->max_serialized_type_size && get()->is_compute_key_provided == type_support->is_compute_key_provided - && get()->topic_data_typename_ == type_support->topic_data_typename_ - && get()->type_identifiers_ == type_support->type_identifiers_; + && get()->get_name() == type_support->get_name() + && get()->type_identifiers() == type_support->type_identifiers(); } /** diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp index 5cb27b771b4..1c5382dac09 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp @@ -82,6 +82,18 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType */ FASTDDS_EXPORTED_API traits::ref_type get_dynamic_type() const noexcept; + /* + * Calculate the key associated to a given object + * @param data payload containing the serialized object whose key is calculated + * @param ihandle @ref eprosima::fastdds::rtps::InstanceHandle_t to fill in + * @param force_md5 use always md5 even if key payload footprint is smaller than the hash + * @return bool specifying success + */ + FASTDDS_EXPORTED_API bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + /* * Calculate the key associated to a given object * @param data object whose key is calculated diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index a537a5b2acf..3ea6e57e82a 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -189,6 +189,11 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -318,6 +323,11 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -414,6 +424,11 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -488,6 +503,11 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -562,6 +582,11 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -636,6 +661,11 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -710,6 +740,11 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -784,6 +819,11 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -858,6 +898,11 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -932,6 +977,11 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1006,6 +1056,11 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1080,6 +1135,11 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1177,6 +1237,11 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1252,6 +1317,11 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1327,6 +1397,11 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1402,6 +1477,11 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1476,6 +1556,11 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1550,6 +1635,11 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1624,6 +1714,11 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1731,6 +1826,11 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1827,6 +1927,11 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1902,6 +2007,11 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1977,6 +2087,11 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2051,6 +2166,11 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2143,6 +2263,11 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2217,6 +2342,11 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2291,6 +2421,11 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2365,6 +2500,11 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2439,6 +2579,11 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2514,6 +2659,11 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2588,6 +2738,11 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2663,6 +2818,11 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2738,6 +2898,11 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2812,6 +2977,11 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2886,6 +3056,11 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2960,6 +3135,11 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3034,6 +3214,11 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3108,6 +3293,11 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3182,6 +3372,11 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3256,6 +3451,11 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3330,6 +3530,11 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3405,6 +3610,11 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3480,6 +3690,11 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3554,6 +3769,11 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3628,6 +3848,11 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3702,6 +3927,11 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3776,6 +4006,11 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3850,6 +4085,11 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3924,6 +4164,11 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3998,6 +4243,11 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4072,6 +4322,11 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4146,6 +4401,11 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4220,6 +4480,11 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4294,6 +4559,11 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4368,6 +4638,11 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4442,6 +4717,11 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4516,6 +4796,11 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4623,6 +4908,11 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4719,6 +5009,11 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4793,6 +5088,11 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4867,6 +5167,11 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4941,6 +5246,11 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5015,6 +5325,11 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5089,6 +5404,11 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5163,6 +5483,11 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5237,6 +5562,11 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5311,6 +5641,11 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5385,6 +5720,11 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5459,6 +5799,11 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5534,6 +5879,11 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5608,6 +5958,11 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5683,6 +6038,11 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5791,6 +6151,11 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5887,6 +6252,11 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5961,6 +6331,11 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6035,6 +6410,11 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6109,6 +6489,11 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6183,6 +6568,11 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6257,6 +6647,11 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6332,6 +6727,11 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6440,6 +6840,11 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6538,6 +6943,11 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6612,6 +7022,11 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6686,6 +7101,11 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6760,6 +7180,11 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6835,6 +7260,11 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6910,6 +7340,11 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6984,6 +7419,11 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7058,6 +7498,11 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7132,6 +7577,11 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7206,6 +7656,11 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7281,6 +7736,11 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7359,6 +7819,11 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7434,6 +7899,11 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7509,6 +7979,11 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7584,6 +8059,11 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7659,6 +8139,11 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx index 0c55b8b6acf..a3de8cd1a95 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx @@ -154,6 +154,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_getTypes_InPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_getTypes_In data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_getTypes_InPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -316,6 +335,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_getTypes_OutPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_getTypes_Out data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_getTypes_OutPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -479,6 +517,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_getTypeDependencies_InPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_getTypeDependencies_In data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_getTypeDependencies_InPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -641,6 +698,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_getTypeDependencies_OutPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_getTypeDependencies_Out data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_getTypeDependencies_OutPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -805,6 +881,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_RequestPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_Request data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_RequestPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -968,6 +1063,25 @@ namespace builtin { delete(reinterpret_cast(data)); } + bool TypeLookup_ReplyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + TypeLookup_Reply data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool TypeLookup_ReplyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index 19facb626a3..4378d81c7b6 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -77,6 +77,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -151,6 +156,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -226,6 +236,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -300,6 +315,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -376,6 +396,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -451,6 +476,11 @@ namespace builtin const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx index abde694c14f..f3266aeb0d6 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx @@ -153,6 +153,25 @@ void EntityId_tPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool EntityId_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + EntityId_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool EntityId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -315,6 +334,25 @@ void GUID_tPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool GUID_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + GUID_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool GUID_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -477,6 +515,25 @@ void SequenceNumber_tPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceNumber_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceNumber_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceNumber_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -639,6 +696,25 @@ void SampleIdentityPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SampleIdentityPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SampleIdentity data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SampleIdentityPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -802,6 +878,25 @@ namespace rpc { delete(reinterpret_cast(data)); } + bool RequestHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + RequestHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool RequestHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -964,6 +1059,25 @@ namespace rpc { delete(reinterpret_cast(data)); } + bool ReplyHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + ReplyHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ReplyHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index f1346012747..d742715e42b 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -106,6 +106,11 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -235,6 +240,11 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -364,6 +374,11 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -493,6 +508,11 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -596,6 +616,11 @@ namespace rpc const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -703,6 +728,11 @@ namespace rpc const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp index d589159b583..e0a5309ed3e 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp @@ -102,6 +102,27 @@ traits::ref_type DynamicPubSubType::get_dynamic_type() const noexce return dynamic_type_; } +bool DynamicPubSubType::compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* handle, + bool force_md5) +{ + if (!dynamic_type_ || !is_compute_key_provided) + { + return false; + } + + traits::ref_type ret_val {traits::narrow( + DynamicDataFactory::get_instance()->create_data( + dynamic_type_))}; + if (deserialize(payload, static_cast(&ret_val))) + { + return compute_key(static_cast(&ret_val), handle, force_md5); + } + + return false; +} + bool DynamicPubSubType::compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* handle, @@ -254,7 +275,7 @@ void DynamicPubSubType::update_dynamic_type() } max_serialized_type_size = static_cast(DynamicDataImpl::calculate_max_serialized_size(dynamic_type_) + 4); - set_name(dynamic_type_->get_name()); + set_name(dynamic_type_->get_name().to_string()); if (TK_STRUCTURE == dynamic_type_->get_kind()) { diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx index f4c8993c1e9..dda5bb0a889 100644 --- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx +++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx @@ -156,6 +156,25 @@ void StringSTypeDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StringSTypeDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StringSTypeDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StringSTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -318,6 +337,25 @@ void StringLTypeDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StringLTypeDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StringLTypeDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StringLTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -480,6 +518,25 @@ void PlainCollectionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainCollectionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainCollectionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -642,6 +699,25 @@ void PlainSequenceSElemDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainSequenceSElemDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainSequenceSElemDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainSequenceSElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -804,6 +880,25 @@ void PlainSequenceLElemDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainSequenceLElemDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainSequenceLElemDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainSequenceLElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -966,6 +1061,25 @@ void PlainArraySElemDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainArraySElemDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainArraySElemDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainArraySElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1128,6 +1242,25 @@ void PlainArrayLElemDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainArrayLElemDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainArrayLElemDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainArrayLElemDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1290,6 +1423,25 @@ void PlainMapSTypeDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainMapSTypeDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainMapSTypeDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainMapSTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1452,6 +1604,25 @@ void PlainMapLTypeDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PlainMapLTypeDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PlainMapLTypeDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PlainMapLTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1614,6 +1785,25 @@ void StronglyConnectedComponentIdPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StronglyConnectedComponentIdPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StronglyConnectedComponentId data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StronglyConnectedComponentIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1776,6 +1966,25 @@ void ExtendedTypeDefnPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ExtendedTypeDefnPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ExtendedTypeDefn data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ExtendedTypeDefnPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1938,6 +2147,25 @@ void DummyPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DummyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Dummy data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DummyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2105,6 +2333,25 @@ void ExtendedAnnotationParameterValuePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ExtendedAnnotationParameterValuePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ExtendedAnnotationParameterValue data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ExtendedAnnotationParameterValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2268,6 +2515,25 @@ void AppliedAnnotationParameterPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppliedAnnotationParameterPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppliedAnnotationParameter data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppliedAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2431,6 +2697,25 @@ void AppliedAnnotationPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppliedAnnotationPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppliedAnnotation data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppliedAnnotationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2594,6 +2879,25 @@ void AppliedVerbatimAnnotationPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppliedVerbatimAnnotationPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppliedVerbatimAnnotation data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppliedVerbatimAnnotationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2756,6 +3060,25 @@ void AppliedBuiltinMemberAnnotationsPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppliedBuiltinMemberAnnotations data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2919,7 +3242,26 @@ void CommonStructMemberPubSubType::delete_data( } bool CommonStructMemberPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonStructMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool CommonStructMemberPubSubType::compute_key( + const void* const data, InstanceHandle_t* handle, bool force_md5) { @@ -3080,6 +3422,25 @@ void CompleteMemberDetailPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteMemberDetailPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteMemberDetail data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteMemberDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3242,6 +3603,25 @@ void MinimalMemberDetailPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalMemberDetailPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalMemberDetail data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalMemberDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3404,6 +3784,25 @@ void CompleteStructMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteStructMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteStructMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteStructMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3567,6 +3966,25 @@ void MinimalStructMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalStructMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalStructMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalStructMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3730,6 +4148,25 @@ void AppliedBuiltinTypeAnnotationsPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppliedBuiltinTypeAnnotations data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3892,6 +4329,25 @@ void MinimalTypeDetailPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalTypeDetailPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalTypeDetail data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalTypeDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4054,6 +4510,25 @@ void CompleteTypeDetailPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteTypeDetailPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteTypeDetail data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteTypeDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4216,6 +4691,25 @@ void CompleteStructHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteStructHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteStructHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteStructHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4378,6 +4872,25 @@ void MinimalStructHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalStructHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalStructHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalStructHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4540,6 +5053,25 @@ void CompleteStructTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteStructTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteStructType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteStructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4702,6 +5234,25 @@ void MinimalStructTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalStructTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalStructType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalStructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4865,6 +5416,25 @@ void CommonUnionMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonUnionMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonUnionMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5027,6 +5597,25 @@ void CompleteUnionMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteUnionMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteUnionMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5190,6 +5779,25 @@ void MinimalUnionMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalUnionMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalUnionMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalUnionMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5353,6 +5961,25 @@ void CommonDiscriminatorMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonDiscriminatorMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonDiscriminatorMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5515,6 +6142,25 @@ void CompleteDiscriminatorMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteDiscriminatorMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteDiscriminatorMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5677,6 +6323,25 @@ void MinimalDiscriminatorMemberPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalDiscriminatorMemberPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalDiscriminatorMember data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalDiscriminatorMemberPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5839,6 +6504,25 @@ void CompleteUnionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteUnionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteUnionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteUnionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6001,6 +6685,25 @@ void MinimalUnionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalUnionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalUnionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalUnionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6163,6 +6866,25 @@ void CompleteUnionTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteUnionTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteUnionType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteUnionTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6325,6 +7047,25 @@ void MinimalUnionTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalUnionTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalUnionType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalUnionTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6487,6 +7228,25 @@ void CommonAnnotationParameterPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonAnnotationParameterPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonAnnotationParameter data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6649,6 +7409,25 @@ void CompleteAnnotationParameterPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAnnotationParameterPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAnnotationParameter data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6812,6 +7591,25 @@ void MinimalAnnotationParameterPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAnnotationParameterPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAnnotationParameter data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAnnotationParameterPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6975,6 +7773,25 @@ void CompleteAnnotationHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAnnotationHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAnnotationHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAnnotationHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7137,6 +7954,25 @@ void MinimalAnnotationHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAnnotationHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAnnotationHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAnnotationHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7299,6 +8135,25 @@ void CompleteAnnotationTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAnnotationTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAnnotationType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAnnotationTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7461,6 +8316,25 @@ void MinimalAnnotationTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAnnotationTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAnnotationType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAnnotationTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7623,6 +8497,25 @@ void CommonAliasBodyPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonAliasBodyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonAliasBody data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7785,6 +8678,25 @@ void CompleteAliasBodyPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAliasBodyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAliasBody data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7947,6 +8859,25 @@ void MinimalAliasBodyPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAliasBodyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAliasBody data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAliasBodyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8109,6 +9040,25 @@ void CompleteAliasHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAliasHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAliasHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAliasHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8271,6 +9221,25 @@ void MinimalAliasHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAliasHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAliasHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAliasHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8433,6 +9402,25 @@ void CompleteAliasTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteAliasTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteAliasType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteAliasTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8595,6 +9583,25 @@ void MinimalAliasTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalAliasTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalAliasType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalAliasTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8757,6 +9764,25 @@ void CompleteElementDetailPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteElementDetailPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteElementDetail data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteElementDetailPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8919,6 +9945,25 @@ void CommonCollectionElementPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonCollectionElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonCollectionElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9081,6 +10126,25 @@ void CompleteCollectionElementPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteCollectionElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteCollectionElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9243,6 +10307,25 @@ void MinimalCollectionElementPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalCollectionElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalCollectionElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalCollectionElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9405,6 +10488,25 @@ void CommonCollectionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonCollectionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonCollectionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9567,6 +10669,25 @@ void CompleteCollectionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteCollectionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteCollectionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9729,6 +10850,25 @@ void MinimalCollectionHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalCollectionHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalCollectionHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalCollectionHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9891,6 +11031,25 @@ void CompleteSequenceTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteSequenceTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteSequenceType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteSequenceTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10053,6 +11212,25 @@ void MinimalSequenceTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalSequenceTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalSequenceType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalSequenceTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10215,6 +11393,25 @@ void CommonArrayHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonArrayHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonArrayHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10377,6 +11574,25 @@ void CompleteArrayHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteArrayHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteArrayHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10539,6 +11755,25 @@ void MinimalArrayHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalArrayHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalArrayHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalArrayHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10701,6 +11936,25 @@ void CompleteArrayTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteArrayTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteArrayType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteArrayTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10863,6 +12117,25 @@ void MinimalArrayTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalArrayTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalArrayType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalArrayTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11025,6 +12298,25 @@ void CompleteMapTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteMapTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteMapType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteMapTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11187,6 +12479,25 @@ void MinimalMapTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalMapTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalMapType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalMapTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11350,6 +12661,25 @@ void CommonEnumeratedLiteralPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonEnumeratedLiteralPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonEnumeratedLiteral data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11512,6 +12842,25 @@ void CompleteEnumeratedLiteralPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteEnumeratedLiteralPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteEnumeratedLiteral data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11675,6 +13024,25 @@ void MinimalEnumeratedLiteralPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalEnumeratedLiteralPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalEnumeratedLiteral data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalEnumeratedLiteralPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11838,6 +13206,25 @@ void CommonEnumeratedHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonEnumeratedHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonEnumeratedHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12000,6 +13387,25 @@ void CompleteEnumeratedHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteEnumeratedHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteEnumeratedHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12162,6 +13568,25 @@ void MinimalEnumeratedHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalEnumeratedHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalEnumeratedHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalEnumeratedHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12324,6 +13749,25 @@ void CompleteEnumeratedTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteEnumeratedTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteEnumeratedType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteEnumeratedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12486,6 +13930,25 @@ void MinimalEnumeratedTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalEnumeratedTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalEnumeratedType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalEnumeratedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12648,6 +14111,25 @@ void CommonBitflagPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonBitflagPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonBitflag data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12810,6 +14292,25 @@ void CompleteBitflagPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteBitflagPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteBitflag data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12973,6 +14474,25 @@ void MinimalBitflagPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalBitflagPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalBitflag data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalBitflagPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13136,6 +14656,25 @@ void CommonBitmaskHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonBitmaskHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonBitmaskHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonBitmaskHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13300,6 +14839,25 @@ void CompleteBitmaskTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteBitmaskTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteBitmaskType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteBitmaskTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13462,6 +15020,25 @@ void MinimalBitmaskTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalBitmaskTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalBitmaskType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalBitmaskTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13624,6 +15201,25 @@ void CommonBitfieldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CommonBitfieldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CommonBitfield data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CommonBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13786,6 +15382,25 @@ void CompleteBitfieldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteBitfieldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteBitfield data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13949,6 +15564,25 @@ void MinimalBitfieldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalBitfieldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalBitfield data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalBitfieldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14112,6 +15746,25 @@ void CompleteBitsetHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteBitsetHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteBitsetHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteBitsetHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14274,6 +15927,25 @@ void MinimalBitsetHeaderPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalBitsetHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalBitsetHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalBitsetHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14436,6 +16108,25 @@ void CompleteBitsetTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteBitsetTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteBitsetType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteBitsetTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14598,6 +16289,25 @@ void MinimalBitsetTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalBitsetTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalBitsetType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalBitsetTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14760,6 +16470,25 @@ void CompleteExtendedTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CompleteExtendedTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CompleteExtendedType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CompleteExtendedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14923,6 +16652,25 @@ void MinimalExtendedTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MinimalExtendedTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MinimalExtendedType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MinimalExtendedTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15089,6 +16837,25 @@ void TypeIdentifierTypeObjectPairPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TypeIdentifierTypeObjectPairPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TypeIdentifierTypeObjectPair data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TypeIdentifierTypeObjectPairPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15252,6 +17019,25 @@ void TypeIdentifierPairPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TypeIdentifierPairPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TypeIdentifierPair data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TypeIdentifierPairPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15415,6 +17201,25 @@ void TypeIdentfierWithSizePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TypeIdentfierWithSizePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TypeIdentfierWithSize data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TypeIdentfierWithSizePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15578,6 +17383,25 @@ void TypeIdentifierWithDependenciesPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TypeIdentifierWithDependenciesPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TypeIdentifierWithDependencies data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TypeIdentifierWithDependenciesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15741,6 +17565,25 @@ void TypeInformationPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TypeInformationPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TypeInformation data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TypeInformationPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx index e44afd7d737..08de7809da7 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -151,6 +151,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool ConnectionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Connection data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ConnectionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -312,6 +331,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool QosPolicyCount_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + QosPolicyCount_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool QosPolicyCount_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -473,6 +511,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool BaseStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + BaseStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool BaseStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -635,6 +692,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool IncompatibleQoSStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + IncompatibleQoSStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -796,6 +872,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool LivelinessChangedStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + LivelinessChangedStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -957,6 +1052,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool DeadlineMissedStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + DeadlineMissedStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1125,6 +1239,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool MonitorServiceStatusDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + MonitorServiceStatusData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index 356ca50f5b1..a8e3e725d53 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -72,6 +72,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -146,6 +151,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -220,6 +230,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -295,6 +310,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -369,6 +389,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -443,6 +468,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -534,6 +564,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index 37748c7c06c..971db5a5e61 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -152,6 +152,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityId_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityId_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityId_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -313,6 +332,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GuidPrefix_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GuidPrefix_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GuidPrefix_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -474,6 +512,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GUID_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GUID_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GUID_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -635,6 +692,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SequenceNumber_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SequenceNumber_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SequenceNumber_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -796,6 +872,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SampleIdentity_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SampleIdentity_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SampleIdentity_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -957,6 +1052,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Locator_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Locator_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Locator_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1120,6 +1234,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool DiscoveryTimePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + DiscoveryTime data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool DiscoveryTimePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1281,6 +1414,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityCountPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityCount data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1442,6 +1594,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SampleIdentityCountPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SampleIdentityCount data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SampleIdentityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1603,6 +1774,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Entity2LocatorTrafficPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Entity2LocatorTraffic data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1764,6 +1954,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool WriterReaderDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + WriterReaderData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool WriterReaderDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1925,6 +2134,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Locator2LocatorDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Locator2LocatorData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Locator2LocatorDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2086,6 +2314,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2247,6 +2494,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool PhysicalDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + PhysicalData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool PhysicalDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index 8a89f861c90..2ec904ef7f9 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -73,6 +73,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -147,6 +152,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -221,6 +231,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -295,6 +310,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -369,6 +389,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -443,6 +468,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -518,6 +548,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -592,6 +627,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -666,6 +706,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -740,6 +785,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -814,6 +864,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -888,6 +943,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -962,6 +1022,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1036,6 +1101,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index 73736d7150d..4c174a2f380 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -89,6 +89,14 @@ class DDSFindTopicTest : public testing::Test { } + bool compute_key( + fastdds::rtps::SerializedPayload_t*, + fastdds::rtps::InstanceHandle_t*, + bool) override + { + return true; + } + bool compute_key( const void* const, fastdds::rtps::InstanceHandle_t*, diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx index e1e701d2bde..2aec15ef5bf 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.cxx +++ b/test/blackbox/types/Data1mbPubSubTypes.cxx @@ -148,6 +148,25 @@ void Data1mbPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Data1mbPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Data1mb data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Data1mbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index f8b1b2fcbfb..6bb7f045134 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -65,6 +65,11 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx index d4fcd33ae4f..ae5ddc754f6 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.cxx +++ b/test/blackbox/types/Data64kbPubSubTypes.cxx @@ -148,6 +148,25 @@ void Data64kbPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Data64kbPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Data64kb data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Data64kbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index f543214a8f5..8adbf865917 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -65,6 +65,11 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx index 15598089295..a8e7906b0d4 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.cxx +++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx @@ -148,6 +148,25 @@ void FixedSizedPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixedSizedPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixedSized data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixedSizedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index 01d0ce82eed..408af23bd90 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -98,6 +98,11 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx index fbfc59189f0..cecfd63487f 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void HelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool HelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + HelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool HelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index cad0a73be41..52686589b0f 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx index 978cb74e3ff..1d4b5a8df1f 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx @@ -148,6 +148,25 @@ void KeyedData1mbPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedData1mbPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedData1mb data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedData1mbPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index 714b3a199e9..2a0b4b94d2e 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -65,6 +65,11 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx index b5e6fb9a45b..9c81f5c91cf 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void KeyedHelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedHelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedHelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index af52501575b..7c74ba26b38 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx index 51eed1aede4..e0c8c72dae2 100644 --- a/test/blackbox/types/StringTestPubSubTypes.cxx +++ b/test/blackbox/types/StringTestPubSubTypes.cxx @@ -148,6 +148,25 @@ void StringTestPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StringTestPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StringTest data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StringTestPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index 27bad35a6e7..f1e138a18fb 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -65,6 +65,11 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx index 1d04f3a65e2..45efc843bf3 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx +++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx @@ -148,6 +148,25 @@ void TestRegression3361PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool TestRegression3361PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + TestRegression3361 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool TestRegression3361PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index 16fcbb4fa9f..1f16d68caed 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -66,6 +66,11 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx index ffbc44c1c80..dc48151fc82 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx @@ -148,6 +148,25 @@ void UnboundedHelloWorldPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnboundedHelloWorldPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnboundedHelloWorld data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnboundedHelloWorldPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index c55e60c4173..02cdecada32 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -65,6 +65,11 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/core/core_typesPubSubTypes.cxx b/test/blackbox/types/core/core_typesPubSubTypes.cxx index 355602635d4..c224971808d 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.cxx +++ b/test/blackbox/types/core/core_typesPubSubTypes.cxx @@ -153,6 +153,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityId_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityId_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -314,6 +333,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool ProtocolVersion_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + ProtocolVersion_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ProtocolVersion_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -475,6 +513,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool VendorId_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + VendorId_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool VendorId_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -636,6 +693,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GuidPrefix_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GuidPrefix_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GuidPrefix_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -797,6 +873,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GUID_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GUID_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GUID_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -958,6 +1053,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SequenceNumber_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SequenceNumber_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SequenceNumber_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1119,6 +1233,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Count_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Count_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Count_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1280,6 +1413,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Time_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Time_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Time_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1442,6 +1594,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SequenceNumberSetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SequenceNumberSet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SequenceNumberSetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1603,6 +1774,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Locator_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Locator_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Locator_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1764,6 +1954,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Duration_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Duration_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Duration_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1927,6 +2136,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool StatusInfo_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + StatusInfo_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool StatusInfo_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2088,6 +2316,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool KeyHash_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + KeyHash_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool KeyHash_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2249,6 +2496,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityName_tPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityName_t data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityName_tPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2412,6 +2678,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool HeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Header data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool HeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2573,6 +2858,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SubmessageHeaderPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SubmessageHeader data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SubmessageHeaderPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2737,6 +3041,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool AckNackSubmessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + AckNackSubmessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool AckNackSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2898,6 +3221,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool HeartBeatSubmessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + HeartBeatSubmessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool HeartBeatSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3059,6 +3401,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool InfoDestinationSubmessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + InfoDestinationSubmessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool InfoDestinationSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3220,6 +3581,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool InfoSourceSubmessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + InfoSourceSubmessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool InfoSourceSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3381,6 +3761,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool InfoTimestampSubmessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + InfoTimestampSubmessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool InfoTimestampSubmessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3543,6 +3942,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool RTPSMessagePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + RTPSMessage data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool RTPSMessagePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index 8feaf1eded0..52e7099c912 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -75,6 +75,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -149,6 +154,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -223,6 +233,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -297,6 +312,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -371,6 +391,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -445,6 +470,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -519,6 +549,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -593,6 +628,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -668,6 +708,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -742,6 +787,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -816,6 +866,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -892,6 +947,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -966,6 +1026,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1040,6 +1105,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1115,6 +1185,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1189,6 +1264,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1266,6 +1346,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1340,6 +1425,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1414,6 +1504,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1488,6 +1583,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1562,6 +1662,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1637,6 +1742,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx index e44afd7d737..08de7809da7 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx @@ -151,6 +151,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool ConnectionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Connection data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ConnectionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -312,6 +331,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool QosPolicyCount_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + QosPolicyCount_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool QosPolicyCount_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -473,6 +511,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool BaseStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + BaseStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool BaseStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -635,6 +692,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool IncompatibleQoSStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + IncompatibleQoSStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -796,6 +872,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool LivelinessChangedStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + LivelinessChangedStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -957,6 +1052,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool DeadlineMissedStatus_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + DeadlineMissedStatus_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1125,6 +1239,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool MonitorServiceStatusDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + MonitorServiceStatusData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index 356ca50f5b1..a8e3e725d53 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -72,6 +72,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -146,6 +151,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -220,6 +230,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -295,6 +310,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -369,6 +389,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -443,6 +468,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -534,6 +564,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index 37748c7c06c..971db5a5e61 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -152,6 +152,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityId_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityId_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityId_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -313,6 +332,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GuidPrefix_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GuidPrefix_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GuidPrefix_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -474,6 +512,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool GUID_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + GUID_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool GUID_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -635,6 +692,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SequenceNumber_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SequenceNumber_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SequenceNumber_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -796,6 +872,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SampleIdentity_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SampleIdentity_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SampleIdentity_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -957,6 +1052,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Locator_sPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Locator_s data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Locator_sPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1120,6 +1234,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool DiscoveryTimePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + DiscoveryTime data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool DiscoveryTimePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1281,6 +1414,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityCountPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityCount data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1442,6 +1594,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool SampleIdentityCountPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + SampleIdentityCount data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool SampleIdentityCountPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1603,6 +1774,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Entity2LocatorTrafficPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Entity2LocatorTraffic data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1764,6 +1954,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool WriterReaderDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + WriterReaderData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool WriterReaderDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1925,6 +2134,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool Locator2LocatorDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Locator2LocatorData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Locator2LocatorDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2086,6 +2314,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool EntityDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + EntityData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool EntityDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2247,6 +2494,25 @@ namespace eprosima { delete(reinterpret_cast(data)); } + bool PhysicalDataPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + PhysicalData data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool PhysicalDataPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index 8a89f861c90..2ec904ef7f9 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -73,6 +73,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -147,6 +152,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -221,6 +231,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -295,6 +310,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -369,6 +389,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -443,6 +468,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -518,6 +548,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -592,6 +627,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -666,6 +706,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -740,6 +785,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -814,6 +864,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -888,6 +943,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -962,6 +1022,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1036,6 +1101,11 @@ namespace eprosima const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/aliasesPubSubTypes.cxx b/test/dds-types-test/aliasesPubSubTypes.cxx index 6c2fa2a30eb..67700b7fa03 100644 --- a/test/dds-types-test/aliasesPubSubTypes.cxx +++ b/test/dds-types-test/aliasesPubSubTypes.cxx @@ -148,6 +148,25 @@ void AliasInt16PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasInt16PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasInt16 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasInt16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void AliasUint16PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasUint16PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasUint16 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasUint16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void AliasInt32PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasInt32PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasInt32 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasInt32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void AliasUInt32PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasUInt32PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasUInt32 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasUInt32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void AliasInt64PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasInt64PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasInt64 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasInt64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void AliasUInt64PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasUInt64PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasUInt64 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasUInt64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void AliasFloat32PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasFloat32PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasFloat32 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasFloat32PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void AliasFloat64PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasFloat64PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasFloat64 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasFloat64PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void AliasFloat128PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasFloat128PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasFloat128 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasFloat128PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void AliasBoolPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasBoolPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasBool data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasBoolPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void AliasOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void AliasChar8PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasChar8PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasChar8 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasChar8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void AliasChar16PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasChar16PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasChar16 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasChar16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void AliasString8PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasString8PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasString8 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasString8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void AliasString16PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasString16PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasString16 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasString16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void AliasEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void AliasBitmaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasBitmaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasBitmask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasBitmaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void AliasAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void AliasArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void AliasMultiArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasMultiArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasMultiArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasMultiArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void AliasSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void AliasMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void AliasUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void AliasStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void AliasBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AliasBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AliasBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index 94025b8c143..4e87a098f74 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -91,6 +91,11 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -165,6 +170,11 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -239,6 +249,11 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -313,6 +328,11 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -387,6 +407,11 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -461,6 +486,11 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -535,6 +565,11 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -609,6 +644,11 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -683,6 +723,11 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -757,6 +802,11 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -831,6 +881,11 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -905,6 +960,11 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -979,6 +1039,11 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1053,6 +1118,11 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1127,6 +1197,11 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1201,6 +1276,11 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1275,6 +1355,11 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1349,6 +1434,11 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1423,6 +1513,11 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1497,6 +1592,11 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1571,6 +1671,11 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1645,6 +1750,11 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1719,6 +1829,11 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1793,6 +1908,11 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1867,6 +1987,11 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/annotationsPubSubTypes.cxx b/test/dds-types-test/annotationsPubSubTypes.cxx index f1980d75efa..3a66cee93ee 100644 --- a/test/dds-types-test/annotationsPubSubTypes.cxx +++ b/test/dds-types-test/annotationsPubSubTypes.cxx @@ -148,6 +148,25 @@ void AnnotatedStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AnnotatedStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AnnotatedStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AnnotatedStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void EmptyAnnotatedStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool EmptyAnnotatedStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + EmptyAnnotatedStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool EmptyAnnotatedStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -471,6 +509,25 @@ void BasicAnnotationsStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BasicAnnotationsStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BasicAnnotationsStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BasicAnnotationsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index c86a3e0e1fb..cfb729f5d55 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -66,6 +66,11 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -215,6 +225,11 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/appendablePubSubTypes.cxx b/test/dds-types-test/appendablePubSubTypes.cxx index 25d80f38c28..e64da97db76 100644 --- a/test/dds-types-test/appendablePubSubTypes.cxx +++ b/test/dds-types-test/appendablePubSubTypes.cxx @@ -148,6 +148,25 @@ void AppendableShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void AppendableUShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableUShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableUShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void AppendableLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void AppendableULongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableULongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableULongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void AppendableLongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableLongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableLongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void AppendableULongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableULongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableULongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void AppendableFloatStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableFloatStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableFloatStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void AppendableDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void AppendableLongDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableLongDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableLongDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void AppendableBooleanStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableBooleanStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableBooleanStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void AppendableOctetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableOctetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableOctetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void AppendableCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void AppendableWCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableWCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableWCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void AppendableUnionStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableUnionStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableUnionStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void AppendableEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void AppendableEmptyInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableEmptyInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableEmptyInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void AppendableInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void AppendableInheritanceEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableInheritanceEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableInheritanceEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableInheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void AppendableExtensibilityInheritancePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AppendableExtensibilityInheritancePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableExtensibilityInheritance data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AppendableExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index 632a05dd705..b38c25f5e06 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -66,6 +66,11 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/arraysPubSubTypes.cxx b/test/dds-types-test/arraysPubSubTypes.cxx index cf0220e01b4..9fff9547de6 100644 --- a/test/dds-types-test/arraysPubSubTypes.cxx +++ b/test/dds-types-test/arraysPubSubTypes.cxx @@ -148,6 +148,25 @@ void ArrayShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void ArrayUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void ArrayLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void ArrayULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void ArrayLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void ArrayULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void ArrayFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void ArrayDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void ArrayLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void ArrayBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void ArrayOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void ArrayCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void ArrayWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void ArrayStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void ArrayWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void ArrayBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void ArrayBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2886,7 +3209,26 @@ void ArrayEnumPubSubType::delete_data( } bool ArrayEnumPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ArrayEnumPubSubType::compute_key( + const void* const data, InstanceHandle_t* handle, bool force_md5) { @@ -3046,6 +3388,25 @@ void ArrayBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void ArrayAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void ArrayShortArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayShortArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayShortArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void ArraySequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void ArrayMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void ArrayUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void ArrayStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void ArrayBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void ArrayMultiDimensionShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void ArrayMultiDimensionUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4656,6 +5188,25 @@ void ArrayMultiDimensionLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4817,6 +5368,25 @@ void ArrayMultiDimensionULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4978,6 +5548,25 @@ void ArrayMultiDimensionLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5139,6 +5728,25 @@ void ArrayMultiDimensionULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5300,6 +5908,25 @@ void ArrayMultiDimensionFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5461,6 +6088,25 @@ void ArrayMultiDimensionDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5622,6 +6268,25 @@ void ArrayMultiDimensionLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5777,10 +6442,29 @@ void* ArrayMultiDimensionBooleanPubSubType::create_data() return reinterpret_cast(new ArrayMultiDimensionBoolean()); } -void ArrayMultiDimensionBooleanPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); +void ArrayMultiDimensionBooleanPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool ArrayMultiDimensionBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; } bool ArrayMultiDimensionBooleanPubSubType::compute_key( @@ -5944,6 +6628,25 @@ void ArrayMultiDimensionOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6105,6 +6808,25 @@ void ArrayMultiDimensionCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6266,6 +6988,25 @@ void ArrayMultiDimensionWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6427,6 +7168,25 @@ void ArrayMultiDimensionStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6588,6 +7348,25 @@ void ArrayMultiDimensionWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6749,6 +7528,25 @@ void ArrayMultiDimensionBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6910,6 +7708,25 @@ void ArrayMultiDimensionBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7071,6 +7888,25 @@ void ArrayMultiDimensionEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7232,6 +8068,25 @@ void ArrayMultiDimensionBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7393,6 +8248,25 @@ void ArrayMultiDimensionAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7554,6 +8428,25 @@ void ArrayMultiDimensionSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7715,6 +8608,25 @@ void ArrayMultiDimensionMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7876,6 +8788,25 @@ void ArrayMultiDimensionUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8037,6 +8968,25 @@ void ArrayMultiDimensionStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8198,6 +9148,25 @@ void ArrayMultiDimensionBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8361,6 +9330,25 @@ void ArraySingleDimensionLiteralsShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8522,6 +9510,25 @@ void ArraySingleDimensionLiteralsUnsignedShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsUnsignedShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8683,6 +9690,25 @@ void ArraySingleDimensionLiteralsLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8844,6 +9870,25 @@ void ArraySingleDimensionLiteralsUnsignedLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsUnsignedLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9005,6 +10050,25 @@ void ArraySingleDimensionLiteralsLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9166,6 +10230,25 @@ void ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsUnsignedLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9327,6 +10410,25 @@ void ArraySingleDimensionLiteralsFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9488,6 +10590,25 @@ void ArraySingleDimensionLiteralsDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9649,6 +10770,25 @@ void ArraySingleDimensionLiteralsLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9810,6 +10950,25 @@ void ArraySingleDimensionLiteralsBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9971,6 +11130,25 @@ void ArraySingleDimensionLiteralsOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10132,6 +11310,25 @@ void ArraySingleDimensionLiteralsCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10293,6 +11490,25 @@ void ArraySingleDimensionLiteralsWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10454,6 +11670,25 @@ void ArraySingleDimensionLiteralsStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10615,6 +11850,25 @@ void ArraySingleDimensionLiteralsWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10776,6 +12030,25 @@ void ArraySingleDimensionLiteralsBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10937,6 +12210,25 @@ void ArraySingleDimensionLiteralsBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11098,6 +12390,25 @@ void ArraySingleDimensionLiteralsEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11259,6 +12570,25 @@ void ArraySingleDimensionLiteralsBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11420,6 +12750,25 @@ void ArraySingleDimensionLiteralsAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11581,6 +12930,25 @@ void ArraySingleDimensionLiteralsShortArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsShortArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11742,6 +13110,25 @@ void ArraySingleDimensionLiteralsSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11903,6 +13290,25 @@ void ArraySingleDimensionLiteralsMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12064,6 +13470,25 @@ void ArraySingleDimensionLiteralsUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12225,6 +13650,25 @@ void ArraySingleDimensionLiteralsStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12386,6 +13830,25 @@ void ArraySingleDimensionLiteralsBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArraySingleDimensionLiteralsBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12547,6 +14010,25 @@ void ArrayMultiDimensionLiteralsShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12708,6 +14190,25 @@ void ArrayMultiDimensionLiteralsUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12869,6 +14370,25 @@ void ArrayMultiDimensionLiteralsLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13030,6 +14550,25 @@ void ArrayMultiDimensionLiteralsULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13191,6 +14730,25 @@ void ArrayMultiDimensionLiteralsLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13352,6 +14910,25 @@ void ArrayMultiDimensionLiteralsULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13513,6 +15090,25 @@ void ArrayMultiDimensionLiteralsFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13674,6 +15270,25 @@ void ArrayMultiDimensionLiteralsDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13835,6 +15450,25 @@ void ArrayMultiDimensionLiteralsLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13996,6 +15630,25 @@ void ArrayMultiDimensionLiteralsBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14157,6 +15810,25 @@ void ArrayMultiDimensionLiteralsOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14318,6 +15990,25 @@ void ArrayMultiDimensionLiteralsCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14479,6 +16170,25 @@ void ArrayMultiDimensionLiteralsWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14640,6 +16350,25 @@ void ArrayMultiDimensionLiteralsStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14801,6 +16530,25 @@ void ArrayMultiDimensionLiteralsWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14962,6 +16710,25 @@ void ArrayMultiDimensionLiteralsBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15123,6 +16890,25 @@ void ArrayMultiDimensionLiteralsBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15284,6 +17070,25 @@ void ArrayMultiDimensionLiteralsEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15445,6 +17250,25 @@ void ArrayMultiDimensionLiteralsBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15606,6 +17430,25 @@ void ArrayMultiDimensionLiteralsAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15767,6 +17610,25 @@ void ArrayMultiDimensionLiteralsSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15928,6 +17790,25 @@ void ArrayMultiDimensionLiteralsMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16089,6 +17970,25 @@ void ArrayMultiDimensionLiteralsUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16250,6 +18150,25 @@ void ArrayMultiDimensionLiteralsStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16411,6 +18330,25 @@ void ArrayMultiDimensionLiteralsBitSetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayMultiDimensionLiteralsBitSet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16572,6 +18510,25 @@ void BoundedSmallArraysPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedSmallArraysPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedSmallArrays data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedSmallArraysPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16733,6 +18690,25 @@ void BoundedBigArraysPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedBigArraysPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedBigArrays data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedBigArraysPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index 3ead9640ded..5e85e313c43 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -66,6 +66,11 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2138,6 +2278,11 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2212,6 +2357,11 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2286,6 +2436,11 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2360,6 +2515,11 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2434,6 +2594,11 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2508,6 +2673,11 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2582,6 +2752,11 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2656,6 +2831,11 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2730,6 +2910,11 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2804,6 +2989,11 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2878,6 +3068,11 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2952,6 +3147,11 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3026,6 +3226,11 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3100,6 +3305,11 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3174,6 +3384,11 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3248,6 +3463,11 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3322,6 +3542,11 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3396,6 +3621,11 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3470,6 +3700,11 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3544,6 +3779,11 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3618,6 +3858,11 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3692,6 +3937,11 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3766,6 +4016,11 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3843,7 +4098,12 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( + const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; @@ -3916,6 +4176,11 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3990,6 +4255,11 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4064,6 +4334,11 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4138,6 +4413,11 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4212,6 +4492,11 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4286,6 +4571,11 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4360,6 +4650,11 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4434,6 +4729,11 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4508,6 +4808,11 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4582,6 +4887,11 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4656,6 +4966,11 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4730,6 +5045,11 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4804,6 +5124,11 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4878,6 +5203,11 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4952,6 +5282,11 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5026,6 +5361,11 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5100,6 +5440,11 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5174,6 +5519,11 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5248,6 +5598,11 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5322,6 +5677,11 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5396,6 +5756,11 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5470,6 +5835,11 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5544,6 +5914,11 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5618,6 +5993,11 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5692,6 +6072,11 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5766,6 +6151,11 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5840,6 +6230,11 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5914,6 +6309,11 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5988,6 +6388,11 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6062,6 +6467,11 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6136,6 +6546,11 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6210,6 +6625,11 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6284,6 +6704,11 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6358,6 +6783,11 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6432,6 +6862,11 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6506,6 +6941,11 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6580,6 +7020,11 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6654,6 +7099,11 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6728,6 +7178,11 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6802,6 +7257,11 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6876,6 +7336,11 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6950,6 +7415,11 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7024,6 +7494,11 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7098,6 +7573,11 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7172,6 +7652,11 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7246,6 +7731,11 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7320,6 +7810,11 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7394,6 +7889,11 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7468,6 +7968,11 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7542,6 +8047,11 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7616,6 +8126,11 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7690,6 +8205,11 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/bitsetsPubSubTypes.cxx b/test/dds-types-test/bitsetsPubSubTypes.cxx index 36d915df7fe..5c0455a7a23 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.cxx +++ b/test/dds-types-test/bitsetsPubSubTypes.cxx @@ -148,6 +148,25 @@ void BitsetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BitsetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BitsetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BitsetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index f7c99cf9daa..56b038104e8 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -66,6 +66,11 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/constantsPubSubTypes.cxx b/test/dds-types-test/constantsPubSubTypes.cxx index 0069b77ba0e..f03e4cfc3c3 100644 --- a/test/dds-types-test/constantsPubSubTypes.cxx +++ b/test/dds-types-test/constantsPubSubTypes.cxx @@ -149,6 +149,25 @@ namespace const_module1 { delete(reinterpret_cast(data)); } + bool ModuleConstsLiteralsStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + ModuleConstsLiteralsStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ModuleConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -313,6 +332,25 @@ namespace const_module2 { delete(reinterpret_cast(data)); } + bool Module2ConstsLiteralsStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + Module2ConstsLiteralsStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool Module2ConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -476,6 +514,25 @@ void ConstsLiteralsStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ConstsLiteralsStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ConstsLiteralsStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ConstsLiteralsStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index ac6531cd533..9852daa0190 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -72,6 +72,11 @@ namespace const_module1 const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -149,6 +154,11 @@ namespace const_module2 const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -224,6 +234,11 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/declarationsPubSubTypes.cxx b/test/dds-types-test/declarationsPubSubTypes.cxx index 0a64195ad81..505567558b0 100644 --- a/test/dds-types-test/declarationsPubSubTypes.cxx +++ b/test/dds-types-test/declarationsPubSubTypes.cxx @@ -146,6 +146,25 @@ void ForwardDeclarationsRecursiveStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ForwardDeclarationsRecursiveStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void ForwardStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ForwardStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ForwardStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -472,6 +510,25 @@ namespace declarations_module { delete(reinterpret_cast(data)); } + bool ForwardStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + ForwardStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -636,6 +693,25 @@ void ModuledForwardDeclarationsRecursiveStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ModuledForwardDeclarationsRecursiveStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -799,6 +875,25 @@ namespace declarations_module { delete(reinterpret_cast(data)); } + bool ModuledForwardStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + ModuledForwardStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool ModuledForwardStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -965,6 +1060,25 @@ void ModuledCommonNameStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ModuledCommonNameStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ModuledCommonNameStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ModuledCommonNameStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index 79b5028d0ee..f725b905ddf 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -70,6 +70,11 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -145,6 +150,11 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -225,6 +235,11 @@ namespace declarations_module const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -300,6 +315,11 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -376,6 +396,11 @@ namespace declarations_module const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -453,6 +478,11 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/enumerationsPubSubTypes.cxx b/test/dds-types-test/enumerationsPubSubTypes.cxx index 73b729e361a..407ea9ec989 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.cxx +++ b/test/dds-types-test/enumerationsPubSubTypes.cxx @@ -151,6 +151,25 @@ void EnumStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool EnumStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + EnumStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool EnumStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -312,6 +331,25 @@ void BitMaskStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BitMaskStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BitMaskStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BitMaskStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -473,6 +511,25 @@ void BoundedBitMaskStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedBitMaskStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedBitMaskStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedBitMaskStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index d53a76567bb..1e258e34b9a 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -69,6 +69,11 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -143,6 +148,11 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -217,6 +227,11 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/externalPubSubTypes.cxx b/test/dds-types-test/externalPubSubTypes.cxx index f3a21efb555..2a8359aa73f 100644 --- a/test/dds-types-test/externalPubSubTypes.cxx +++ b/test/dds-types-test/externalPubSubTypes.cxx @@ -146,6 +146,25 @@ void short_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool short_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + short_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -308,6 +327,25 @@ void ushort_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ushort_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ushort_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ushort_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void long_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool long_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + long_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool long_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -632,6 +689,25 @@ void ulong_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulong_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulong_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -794,6 +870,25 @@ void longlong_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longlong_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longlong_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longlong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -956,6 +1051,25 @@ void ulonglong_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulonglong_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulonglong_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulonglong_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1118,6 +1232,25 @@ void float_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool float_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + float_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool float_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1280,6 +1413,25 @@ void double_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool double_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + double_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool double_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1442,6 +1594,25 @@ void longdouble_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longdouble_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longdouble_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longdouble_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1604,6 +1775,25 @@ void boolean_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool boolean_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + boolean_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool boolean_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1766,6 +1956,25 @@ void octet_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool octet_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + octet_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool octet_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1928,6 +2137,25 @@ void char_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool char_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + char_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool char_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2090,6 +2318,25 @@ void wchar_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool wchar_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + wchar_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool wchar_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2252,6 +2499,25 @@ void sequence_short_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool sequence_short_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sequence_short_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool sequence_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2414,6 +2680,25 @@ void string_unbounded_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_unbounded_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_unbounded_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_unbounded_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2576,6 +2861,25 @@ void string_bounded_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_bounded_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_bounded_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_bounded_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2738,6 +3042,25 @@ void map_short_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool map_short_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + map_short_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool map_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2900,6 +3223,25 @@ void array_short_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool array_short_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + array_short_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool array_short_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3062,6 +3404,25 @@ void struct_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3224,6 +3585,25 @@ void InnerStructExternalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructExternalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructExternal data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructExternalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3386,6 +3766,25 @@ void ext_struct_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ext_struct_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ext_struct_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ext_struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3548,6 +3947,25 @@ void ext_and_inner_struct_externalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ext_and_inner_struct_externalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ext_and_inner_struct_external data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ext_and_inner_struct_externalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3710,6 +4128,25 @@ void struct_external_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_external_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_external_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_external_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3873,6 +4310,25 @@ void recursive_union_containerPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool recursive_union_containerPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + recursive_union_container data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool recursive_union_containerPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4036,6 +4492,25 @@ void recursive_test_1PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool recursive_test_1PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + recursive_test_1 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool recursive_test_1PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4200,6 +4675,25 @@ void recursive_structurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool recursive_structurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + recursive_structure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool recursive_structurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4362,6 +4856,25 @@ void recursive_test_2PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool recursive_test_2PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + recursive_test_2 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool recursive_test_2PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index 9b3902b0701..981d1db74ce 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -66,6 +66,11 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1769,6 +1884,11 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1844,6 +1964,11 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1920,6 +2045,11 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1994,6 +2124,11 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/finalPubSubTypes.cxx b/test/dds-types-test/finalPubSubTypes.cxx index 59b5523ea48..1c49bea7172 100644 --- a/test/dds-types-test/finalPubSubTypes.cxx +++ b/test/dds-types-test/finalPubSubTypes.cxx @@ -148,6 +148,25 @@ void FinalShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void FinalUShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalUShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalUShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void FinalLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void FinalULongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalULongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalULongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void FinalLongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalLongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalLongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void FinalULongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalULongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalULongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void FinalFloatStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalFloatStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalFloatStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void FinalDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void FinalLongDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalLongDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalLongDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void FinalBooleanStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalBooleanStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalBooleanStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void FinalOctetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalOctetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalOctetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void FinalCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void FinalWCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalWCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalWCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void FinalUnionStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalUnionStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalUnionStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void FinalEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void FinalEmptyInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalEmptyInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalEmptyInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void FinalInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void InheritanceEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InheritanceEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InheritanceEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void FinalExtensibilityInheritancePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FinalExtensibilityInheritancePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalExtensibilityInheritance data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FinalExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index 9a5d707d6e8..c760497ec7a 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -99,6 +99,11 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -228,6 +233,11 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -357,6 +367,11 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -486,6 +501,11 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -615,6 +635,11 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -744,6 +769,11 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -873,6 +903,11 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1002,6 +1037,11 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1131,6 +1171,11 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1260,6 +1305,11 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1389,6 +1439,11 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1518,6 +1573,11 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1647,6 +1707,11 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1743,6 +1808,11 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1817,6 +1887,11 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1909,6 +1984,11 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1983,6 +2063,11 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2057,6 +2142,11 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2186,6 +2276,11 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx index 55ee9bf3e16..56ea44e407f 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx @@ -148,6 +148,25 @@ void InnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void InnerEmptyStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerEmptyStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerEmptyStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerEmptyStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index b2769206512..a5f76bb8d39 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -66,6 +66,11 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/inheritancePubSubTypes.cxx b/test/dds-types-test/inheritancePubSubTypes.cxx index 936b7b9ac19..dca7d0dc9c1 100644 --- a/test/dds-types-test/inheritancePubSubTypes.cxx +++ b/test/dds-types-test/inheritancePubSubTypes.cxx @@ -148,6 +148,25 @@ void InnerStructureHelperChildPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructureHelperChildPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructureHelperChild data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructureHelperChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void InnerStructureHelperChildChildPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructureHelperChildChildPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructureHelperChildChild data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructureHelperChildChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void InnerStructureHelperEmptyChildPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructureHelperEmptyChildPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructureHelperEmptyChild data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructureHelperEmptyChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void InnerStructureHelperEmptyChildChildPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructureHelperEmptyChildChild data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void InnerEmptyStructureHelperChildPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerEmptyStructureHelperChildPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerEmptyStructureHelperChild data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerEmptyStructureHelperChildPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void StructAliasInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructAliasInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructAliasInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructAliasInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void StructuresInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructuresInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructuresInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructuresInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1278,6 +1411,25 @@ void BitsetsChildInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BitsetsChildInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BitsetsChildInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BitsetsChildInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index a4eaba10cb5..fd7c0ea2e91 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -66,6 +66,11 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -587,6 +622,11 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/keyPubSubTypes.cxx b/test/dds-types-test/keyPubSubTypes.cxx index 99af94e8228..5f9d64a6c8f 100644 --- a/test/dds-types-test/keyPubSubTypes.cxx +++ b/test/dds-types-test/keyPubSubTypes.cxx @@ -148,6 +148,25 @@ void KeyedShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void KeyedUShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedUShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedUShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void KeyedLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void KeyedULongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedULongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedULongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void KeyedLongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedLongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedLongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void KeyedULongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedULongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedULongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void KeyedFloatStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedFloatStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedFloatStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void KeyedDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void KeyedLongDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedLongDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedLongDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void KeyedBooleanStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedBooleanStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedBooleanStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void KeyedOctetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedOctetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedOctetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void KeyedCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void KeyedWCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedWCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedWCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void KeyedEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void KeyedEmptyInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedEmptyInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedEmptyInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void KeyedInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool KeyedInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyedInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool KeyedInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void InheritanceKeyedEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InheritanceKeyedEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InheritanceKeyedEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InheritanceKeyedEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index 0d7c680e3c5..396fc027302 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -65,6 +65,11 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -139,6 +144,11 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -213,6 +223,11 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -287,6 +302,11 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -361,6 +381,11 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -435,6 +460,11 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -509,6 +539,11 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -583,6 +618,11 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -657,6 +697,11 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -731,6 +776,11 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -805,6 +855,11 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -879,6 +934,11 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -953,6 +1013,11 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1027,6 +1092,11 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1101,6 +1171,11 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1175,6 +1250,11 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1249,6 +1329,11 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/mapsPubSubTypes.cxx b/test/dds-types-test/mapsPubSubTypes.cxx index 7bdf6195341..0942be11fb1 100644 --- a/test/dds-types-test/mapsPubSubTypes.cxx +++ b/test/dds-types-test/mapsPubSubTypes.cxx @@ -148,6 +148,25 @@ void MapShortShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void MapShortUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void MapShortLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void MapShortULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void MapShortLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void MapShortULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1115,7 +1229,7 @@ void MapShortFloatPubSubType::delete_data( } bool MapShortFloatPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -1124,158 +1238,16 @@ bool MapShortFloatPubSubType::compute_key( return false; } - const MapShortFloat* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapShortFloat_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::serialize_key(ser, *p_type); - if (force_md5 || MapShortFloat_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapShortFloatPubSubType::register_type_object_representation() -{ - register_MapShortFloat_type_identifier(type_identifiers_); -} - -MapShortDoublePubSubType::MapShortDoublePubSubType() -{ - set_name("MapShortDouble"); - uint32_t type_size = MapShortDouble_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapShortDouble_max_key_cdr_typesize > 16 ? MapShortDouble_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapShortDoublePubSubType::~MapShortDoublePubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapShortDoublePubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapShortDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapShortDoublePubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapShortDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapShortDoublePubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapShortFloat data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapShortDoublePubSubType::create_data() -{ - return reinterpret_cast(new MapShortDouble()); -} -void MapShortDoublePubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapShortDoublePubSubType::compute_key( +bool MapShortFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -1285,16 +1257,16 @@ bool MapShortDoublePubSubType::compute_key( return false; } - const MapShortDouble* p_type = static_cast(data); + const MapShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapShortDouble_max_key_cdr_typesize); + MapShortFloat_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::serialize_key(ser, *p_type); - if (force_md5 || MapShortDouble_max_key_cdr_typesize > 16) + if (force_md5 || MapShortFloat_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -1314,24 +1286,24 @@ bool MapShortDoublePubSubType::compute_key( return true; } -void MapShortDoublePubSubType::register_type_object_representation() +void MapShortFloatPubSubType::register_type_object_representation() { - register_MapShortDouble_type_identifier(type_identifiers_); + register_MapShortFloat_type_identifier(type_identifiers_); } -MapShortLongDoublePubSubType::MapShortLongDoublePubSubType() +MapShortDoublePubSubType::MapShortDoublePubSubType() { - set_name("MapShortLongDouble"); - uint32_t type_size = MapShortLongDouble_max_cdr_typesize; + set_name("MapShortDouble"); + uint32_t type_size = MapShortDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapShortLongDouble_max_key_cdr_typesize > 16 ? MapShortLongDouble_max_key_cdr_typesize : 16; + uint32_t key_length = MapShortDouble_max_key_cdr_typesize > 16 ? MapShortDouble_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapShortLongDoublePubSubType::~MapShortLongDoublePubSubType() +MapShortDoublePubSubType::~MapShortDoublePubSubType() { if (key_buffer_ != nullptr) { @@ -1339,12 +1311,192 @@ MapShortLongDoublePubSubType::~MapShortLongDoublePubSubType() } } -bool MapShortLongDoublePubSubType::serialize( +bool MapShortDoublePubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapShortLongDouble* p_type = static_cast(data); + const MapShortDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapShortDoublePubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapShortDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapShortDoublePubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapShortDoublePubSubType::create_data() +{ + return reinterpret_cast(new MapShortDouble()); +} + +void MapShortDoublePubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapShortDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapShortDoublePubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapShortDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapShortDouble_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::serialize_key(ser, *p_type); + if (force_md5 || MapShortDouble_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapShortDoublePubSubType::register_type_object_representation() +{ + register_MapShortDouble_type_identifier(type_identifiers_); +} + +MapShortLongDoublePubSubType::MapShortLongDoublePubSubType() +{ + set_name("MapShortLongDouble"); + uint32_t type_size = MapShortLongDouble_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortLongDouble_max_key_cdr_typesize > 16 ? MapShortLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapShortLongDoublePubSubType::~MapShortLongDoublePubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapShortLongDoublePubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -1436,6 +1588,25 @@ void MapShortLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void MapShortBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void MapShortOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void MapShortCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void MapShortWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void MapShortStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void MapShortWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void MapShortInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void MapShortInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void MapShortInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void MapShortInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void MapShortInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3369,7 +3749,7 @@ void MapShortInnerAliasArrayHelperPubSubType::delete_data( } bool MapShortInnerAliasArrayHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -3378,158 +3758,16 @@ bool MapShortInnerAliasArrayHelperPubSubType::compute_key( return false; } - const MapShortInnerAliasArrayHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapShortInnerAliasArrayHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapShortInnerAliasArrayHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapShortInnerAliasArrayHelperPubSubType::register_type_object_representation() -{ - register_MapShortInnerAliasArrayHelper_type_identifier(type_identifiers_); -} - -MapShortInnerAliasSequenceHelperPubSubType::MapShortInnerAliasSequenceHelperPubSubType() -{ - set_name("MapShortInnerAliasSequenceHelper"); - uint32_t type_size = MapShortInnerAliasSequenceHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapShortInnerAliasSequenceHelperPubSubType::~MapShortInnerAliasSequenceHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapShortInnerAliasSequenceHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapShortInnerAliasSequenceHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapShortInnerAliasSequenceHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapShortInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapShortInnerAliasSequenceHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapShortInnerAliasSequenceHelper()); -} -void MapShortInnerAliasSequenceHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( +bool MapShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -3539,16 +3777,16 @@ bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( return false; } - const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); + const MapShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapShortInnerAliasSequenceHelper_max_key_cdr_typesize); + MapShortInnerAliasArrayHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapShortInnerAliasArrayHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -3568,24 +3806,24 @@ bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( return true; } -void MapShortInnerAliasSequenceHelperPubSubType::register_type_object_representation() +void MapShortInnerAliasArrayHelperPubSubType::register_type_object_representation() { - register_MapShortInnerAliasSequenceHelper_type_identifier(type_identifiers_); + register_MapShortInnerAliasArrayHelper_type_identifier(type_identifiers_); } -MapShortInnerAliasMapHelperPubSubType::MapShortInnerAliasMapHelperPubSubType() +MapShortInnerAliasSequenceHelperPubSubType::MapShortInnerAliasSequenceHelperPubSubType() { - set_name("MapShortInnerAliasMapHelper"); - uint32_t type_size = MapShortInnerAliasMapHelper_max_cdr_typesize; + set_name("MapShortInnerAliasSequenceHelper"); + uint32_t type_size = MapShortInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasMapHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasSequenceHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapShortInnerAliasMapHelperPubSubType::~MapShortInnerAliasMapHelperPubSubType() +MapShortInnerAliasSequenceHelperPubSubType::~MapShortInnerAliasSequenceHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -3593,12 +3831,192 @@ MapShortInnerAliasMapHelperPubSubType::~MapShortInnerAliasMapHelperPubSubType() } } -bool MapShortInnerAliasMapHelperPubSubType::serialize( +bool MapShortInnerAliasSequenceHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapShortInnerAliasMapHelper* p_type = static_cast(data); + const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapShortInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapShortInnerAliasSequenceHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapShortInnerAliasSequenceHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapShortInnerAliasSequenceHelper()); +} + +void MapShortInnerAliasSequenceHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapShortInnerAliasSequenceHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapShortInnerAliasSequenceHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapShortInnerAliasSequenceHelperPubSubType::register_type_object_representation() +{ + register_MapShortInnerAliasSequenceHelper_type_identifier(type_identifiers_); +} + +MapShortInnerAliasMapHelperPubSubType::MapShortInnerAliasMapHelperPubSubType() +{ + set_name("MapShortInnerAliasMapHelper"); + uint32_t type_size = MapShortInnerAliasMapHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapShortInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapShortInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapShortInnerAliasMapHelperPubSubType::~MapShortInnerAliasMapHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapShortInnerAliasMapHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -3690,6 +4108,25 @@ void MapShortInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void MapShortInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void MapShortInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void MapShortInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapShortInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapShortInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapShortInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void MapUShortShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void MapUShortUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4656,6 +5188,25 @@ void MapUShortLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4817,6 +5368,25 @@ void MapUShortULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4978,6 +5548,25 @@ void MapUShortLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5139,6 +5728,25 @@ void MapUShortULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5300,6 +5908,25 @@ void MapUShortFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5461,6 +6088,25 @@ void MapUShortDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5623,7 +6269,7 @@ void MapUShortLongDoublePubSubType::delete_data( } bool MapUShortLongDoublePubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -5632,158 +6278,16 @@ bool MapUShortLongDoublePubSubType::compute_key( return false; } - const MapUShortLongDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapUShortLongDouble_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::serialize_key(ser, *p_type); - if (force_md5 || MapUShortLongDouble_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapUShortLongDoublePubSubType::register_type_object_representation() -{ - register_MapUShortLongDouble_type_identifier(type_identifiers_); -} - -MapUShortBooleanPubSubType::MapUShortBooleanPubSubType() -{ - set_name("MapUShortBoolean"); - uint32_t type_size = MapUShortBoolean_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapUShortBoolean_max_key_cdr_typesize > 16 ? MapUShortBoolean_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapUShortBooleanPubSubType::~MapUShortBooleanPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapUShortBooleanPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapUShortBoolean* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapUShortBooleanPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapUShortBoolean* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapUShortBooleanPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapUShortLongDouble data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapUShortBooleanPubSubType::create_data() -{ - return reinterpret_cast(new MapUShortBoolean()); -} -void MapUShortBooleanPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapUShortBooleanPubSubType::compute_key( +bool MapUShortLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -5793,16 +6297,16 @@ bool MapUShortBooleanPubSubType::compute_key( return false; } - const MapUShortBoolean* p_type = static_cast(data); + const MapUShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapUShortBoolean_max_key_cdr_typesize); + MapUShortLongDouble_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::serialize_key(ser, *p_type); - if (force_md5 || MapUShortBoolean_max_key_cdr_typesize > 16) + if (force_md5 || MapUShortLongDouble_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -5822,24 +6326,24 @@ bool MapUShortBooleanPubSubType::compute_key( return true; } -void MapUShortBooleanPubSubType::register_type_object_representation() +void MapUShortLongDoublePubSubType::register_type_object_representation() { - register_MapUShortBoolean_type_identifier(type_identifiers_); + register_MapUShortLongDouble_type_identifier(type_identifiers_); } -MapUShortOctetPubSubType::MapUShortOctetPubSubType() +MapUShortBooleanPubSubType::MapUShortBooleanPubSubType() { - set_name("MapUShortOctet"); - uint32_t type_size = MapUShortOctet_max_cdr_typesize; + set_name("MapUShortBoolean"); + uint32_t type_size = MapUShortBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapUShortOctet_max_key_cdr_typesize > 16 ? MapUShortOctet_max_key_cdr_typesize : 16; + uint32_t key_length = MapUShortBoolean_max_key_cdr_typesize > 16 ? MapUShortBoolean_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapUShortOctetPubSubType::~MapUShortOctetPubSubType() +MapUShortBooleanPubSubType::~MapUShortBooleanPubSubType() { if (key_buffer_ != nullptr) { @@ -5847,12 +6351,192 @@ MapUShortOctetPubSubType::~MapUShortOctetPubSubType() } } -bool MapUShortOctetPubSubType::serialize( +bool MapUShortBooleanPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapUShortOctet* p_type = static_cast(data); + const MapUShortBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapUShortBooleanPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapUShortBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapUShortBooleanPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapUShortBooleanPubSubType::create_data() +{ + return reinterpret_cast(new MapUShortBoolean()); +} + +void MapUShortBooleanPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapUShortBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapUShortBooleanPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapUShortBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapUShortBoolean_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::serialize_key(ser, *p_type); + if (force_md5 || MapUShortBoolean_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapUShortBooleanPubSubType::register_type_object_representation() +{ + register_MapUShortBoolean_type_identifier(type_identifiers_); +} + +MapUShortOctetPubSubType::MapUShortOctetPubSubType() +{ + set_name("MapUShortOctet"); + uint32_t type_size = MapUShortOctet_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortOctet_max_key_cdr_typesize > 16 ? MapUShortOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapUShortOctetPubSubType::~MapUShortOctetPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapUShortOctetPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapUShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -5944,6 +6628,25 @@ void MapUShortOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6105,6 +6808,25 @@ void MapUShortCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6266,6 +6988,25 @@ void MapUShortWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6427,6 +7168,25 @@ void MapUShortStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6588,6 +7348,25 @@ void MapUShortWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6749,6 +7528,25 @@ void MapUShortInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6910,6 +7708,25 @@ void MapUShortInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7071,6 +7888,25 @@ void MapUShortInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7232,6 +8068,25 @@ void MapUShortInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7393,6 +8248,25 @@ void MapUShortInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7554,6 +8428,25 @@ void MapUShortInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7715,6 +8608,25 @@ void MapUShortInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7877,7 +8789,7 @@ void MapUShortInnerAliasMapHelperPubSubType::delete_data( } bool MapUShortInnerAliasMapHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -7886,158 +8798,16 @@ bool MapUShortInnerAliasMapHelperPubSubType::compute_key( return false; } - const MapUShortInnerAliasMapHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapUShortInnerAliasMapHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapUShortInnerAliasMapHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapUShortInnerAliasMapHelperPubSubType::register_type_object_representation() -{ - register_MapUShortInnerAliasMapHelper_type_identifier(type_identifiers_); -} - -MapUShortInnerUnionHelperPubSubType::MapUShortInnerUnionHelperPubSubType() -{ - set_name("MapUShortInnerUnionHelper"); - uint32_t type_size = MapUShortInnerUnionHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapUShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapUShortInnerUnionHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapUShortInnerUnionHelperPubSubType::~MapUShortInnerUnionHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapUShortInnerUnionHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapUShortInnerUnionHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapUShortInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapUShortInnerUnionHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapUShortInnerUnionHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapUShortInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapUShortInnerUnionHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapUShortInnerUnionHelper()); -} -void MapUShortInnerUnionHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapUShortInnerUnionHelperPubSubType::compute_key( +bool MapUShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -8047,16 +8817,16 @@ bool MapUShortInnerUnionHelperPubSubType::compute_key( return false; } - const MapUShortInnerUnionHelper* p_type = static_cast(data); + const MapUShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapUShortInnerUnionHelper_max_key_cdr_typesize); + MapUShortInnerAliasMapHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapUShortInnerUnionHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapUShortInnerAliasMapHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -8076,24 +8846,24 @@ bool MapUShortInnerUnionHelperPubSubType::compute_key( return true; } -void MapUShortInnerUnionHelperPubSubType::register_type_object_representation() +void MapUShortInnerAliasMapHelperPubSubType::register_type_object_representation() { - register_MapUShortInnerUnionHelper_type_identifier(type_identifiers_); + register_MapUShortInnerAliasMapHelper_type_identifier(type_identifiers_); } -MapUShortInnerStructureHelperPubSubType::MapUShortInnerStructureHelperPubSubType() +MapUShortInnerUnionHelperPubSubType::MapUShortInnerUnionHelperPubSubType() { - set_name("MapUShortInnerStructureHelper"); - uint32_t type_size = MapUShortInnerStructureHelper_max_cdr_typesize; + set_name("MapUShortInnerUnionHelper"); + uint32_t type_size = MapUShortInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapUShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapUShortInnerStructureHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapUShortInnerUnionHelper_max_key_cdr_typesize > 16 ? MapUShortInnerUnionHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapUShortInnerStructureHelperPubSubType::~MapUShortInnerStructureHelperPubSubType() +MapUShortInnerUnionHelperPubSubType::~MapUShortInnerUnionHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -8101,12 +8871,192 @@ MapUShortInnerStructureHelperPubSubType::~MapUShortInnerStructureHelperPubSubTyp } } -bool MapUShortInnerStructureHelperPubSubType::serialize( +bool MapUShortInnerUnionHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapUShortInnerStructureHelper* p_type = static_cast(data); + const MapUShortInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapUShortInnerUnionHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapUShortInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapUShortInnerUnionHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapUShortInnerUnionHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapUShortInnerUnionHelper()); +} + +void MapUShortInnerUnionHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapUShortInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapUShortInnerUnionHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapUShortInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapUShortInnerUnionHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapUShortInnerUnionHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapUShortInnerUnionHelperPubSubType::register_type_object_representation() +{ + register_MapUShortInnerUnionHelper_type_identifier(type_identifiers_); +} + +MapUShortInnerStructureHelperPubSubType::MapUShortInnerStructureHelperPubSubType() +{ + set_name("MapUShortInnerStructureHelper"); + uint32_t type_size = MapUShortInnerStructureHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapUShortInnerStructureHelper_max_key_cdr_typesize > 16 ? MapUShortInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapUShortInnerStructureHelperPubSubType::~MapUShortInnerStructureHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapUShortInnerStructureHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapUShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -8198,6 +9148,25 @@ void MapUShortInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8359,6 +9328,25 @@ void MapUShortInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapUShortInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapUShortInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapUShortInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8520,6 +9508,25 @@ void MapLongShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8681,6 +9688,25 @@ void MapLongUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8842,6 +9868,25 @@ void MapLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9003,6 +10048,25 @@ void MapLongULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9164,6 +10228,25 @@ void MapLongKeyLongLongValuePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongKeyLongLongValuePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongKeyLongLongValue data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongKeyLongLongValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9325,6 +10408,25 @@ void MapLongULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9486,6 +10588,25 @@ void MapLongFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9647,6 +10768,25 @@ void MapLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9808,6 +10948,25 @@ void MapLongKeyLongDoubleValuePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongKeyLongDoubleValuePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongKeyLongDoubleValue data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongKeyLongDoubleValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9969,6 +11128,25 @@ void MapLongBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10131,7 +11309,7 @@ void MapLongOctetPubSubType::delete_data( } bool MapLongOctetPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -10140,158 +11318,16 @@ bool MapLongOctetPubSubType::compute_key( return false; } - const MapLongOctet* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongOctet_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongOctet_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapLongOctetPubSubType::register_type_object_representation() -{ - register_MapLongOctet_type_identifier(type_identifiers_); -} - -MapLongCharPubSubType::MapLongCharPubSubType() -{ - set_name("MapLongChar"); - uint32_t type_size = MapLongChar_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapLongChar_max_key_cdr_typesize > 16 ? MapLongChar_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapLongCharPubSubType::~MapLongCharPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapLongCharPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapLongChar* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapLongCharPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapLongChar* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapLongCharPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapLongOctet data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapLongCharPubSubType::create_data() -{ - return reinterpret_cast(new MapLongChar()); -} -void MapLongCharPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapLongCharPubSubType::compute_key( +bool MapLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -10301,16 +11337,16 @@ bool MapLongCharPubSubType::compute_key( return false; } - const MapLongChar* p_type = static_cast(data); + const MapLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongChar_max_key_cdr_typesize); + MapLongOctet_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongChar_max_key_cdr_typesize > 16) + if (force_md5 || MapLongOctet_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -10330,24 +11366,24 @@ bool MapLongCharPubSubType::compute_key( return true; } -void MapLongCharPubSubType::register_type_object_representation() +void MapLongOctetPubSubType::register_type_object_representation() { - register_MapLongChar_type_identifier(type_identifiers_); + register_MapLongOctet_type_identifier(type_identifiers_); } -MapLongWCharPubSubType::MapLongWCharPubSubType() +MapLongCharPubSubType::MapLongCharPubSubType() { - set_name("MapLongWChar"); - uint32_t type_size = MapLongWChar_max_cdr_typesize; + set_name("MapLongChar"); + uint32_t type_size = MapLongChar_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapLongWChar_max_key_cdr_typesize > 16 ? MapLongWChar_max_key_cdr_typesize : 16; + uint32_t key_length = MapLongChar_max_key_cdr_typesize > 16 ? MapLongChar_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapLongWCharPubSubType::~MapLongWCharPubSubType() +MapLongCharPubSubType::~MapLongCharPubSubType() { if (key_buffer_ != nullptr) { @@ -10355,12 +11391,192 @@ MapLongWCharPubSubType::~MapLongWCharPubSubType() } } -bool MapLongWCharPubSubType::serialize( +bool MapLongCharPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapLongWChar* p_type = static_cast(data); + const MapLongChar* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapLongCharPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapLongChar* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapLongCharPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapLongCharPubSubType::create_data() +{ + return reinterpret_cast(new MapLongChar()); +} + +void MapLongCharPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapLongCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapLongCharPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapLongChar* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapLongChar_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::serialize_key(ser, *p_type); + if (force_md5 || MapLongChar_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapLongCharPubSubType::register_type_object_representation() +{ + register_MapLongChar_type_identifier(type_identifiers_); +} + +MapLongWCharPubSubType::MapLongWCharPubSubType() +{ + set_name("MapLongWChar"); + uint32_t type_size = MapLongWChar_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongWChar_max_key_cdr_typesize > 16 ? MapLongWChar_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapLongWCharPubSubType::~MapLongWCharPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapLongWCharPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -10452,6 +11668,25 @@ void MapLongWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10613,6 +11848,25 @@ void MapLongStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10774,6 +12028,25 @@ void MapLongWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10935,6 +12208,25 @@ void MapLongInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11096,6 +12388,25 @@ void MapLongInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11257,6 +12568,25 @@ void MapLongInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11418,6 +12748,25 @@ void MapLongInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11579,6 +12928,25 @@ void MapLongInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11740,6 +13108,25 @@ void MapLongInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11901,6 +13288,25 @@ void MapLongInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12062,6 +13468,25 @@ void MapLongInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12223,6 +13648,25 @@ void MapLongInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12385,7 +13829,7 @@ void MapLongInnerStructureHelperPubSubType::delete_data( } bool MapLongInnerStructureHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -12394,158 +13838,16 @@ bool MapLongInnerStructureHelperPubSubType::compute_key( return false; } - const MapLongInnerStructureHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongInnerStructureHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongInnerStructureHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapLongInnerStructureHelperPubSubType::register_type_object_representation() -{ - register_MapLongInnerStructureHelper_type_identifier(type_identifiers_); -} - -MapLongInnerBitsetHelperPubSubType::MapLongInnerBitsetHelperPubSubType() -{ - set_name("MapLongInnerBitsetHelper"); - uint32_t type_size = MapLongInnerBitsetHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitsetHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapLongInnerBitsetHelperPubSubType::~MapLongInnerBitsetHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapLongInnerBitsetHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapLongInnerBitsetHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapLongInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapLongInnerBitsetHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapLongInnerBitsetHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapLongInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapLongInnerBitsetHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapLongInnerBitsetHelper()); -} -void MapLongInnerBitsetHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapLongInnerBitsetHelperPubSubType::compute_key( +bool MapLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -12555,16 +13857,16 @@ bool MapLongInnerBitsetHelperPubSubType::compute_key( return false; } - const MapLongInnerBitsetHelper* p_type = static_cast(data); + const MapLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongInnerBitsetHelper_max_key_cdr_typesize); + MapLongInnerStructureHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongInnerBitsetHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapLongInnerStructureHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -12584,24 +13886,24 @@ bool MapLongInnerBitsetHelperPubSubType::compute_key( return true; } -void MapLongInnerBitsetHelperPubSubType::register_type_object_representation() +void MapLongInnerStructureHelperPubSubType::register_type_object_representation() { - register_MapLongInnerBitsetHelper_type_identifier(type_identifiers_); + register_MapLongInnerStructureHelper_type_identifier(type_identifiers_); } -MapULongShortPubSubType::MapULongShortPubSubType() +MapLongInnerBitsetHelperPubSubType::MapLongInnerBitsetHelperPubSubType() { - set_name("MapULongShort"); - uint32_t type_size = MapULongShort_max_cdr_typesize; + set_name("MapLongInnerBitsetHelper"); + uint32_t type_size = MapLongInnerBitsetHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapULongShort_max_key_cdr_typesize > 16 ? MapULongShort_max_key_cdr_typesize : 16; + uint32_t key_length = MapLongInnerBitsetHelper_max_key_cdr_typesize > 16 ? MapLongInnerBitsetHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapULongShortPubSubType::~MapULongShortPubSubType() +MapLongInnerBitsetHelperPubSubType::~MapLongInnerBitsetHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -12609,12 +13911,192 @@ MapULongShortPubSubType::~MapULongShortPubSubType() } } -bool MapULongShortPubSubType::serialize( +bool MapLongInnerBitsetHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapULongShort* p_type = static_cast(data); + const MapLongInnerBitsetHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapLongInnerBitsetHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapLongInnerBitsetHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapLongInnerBitsetHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapLongInnerBitsetHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapLongInnerBitsetHelper()); +} + +void MapLongInnerBitsetHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapLongInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapLongInnerBitsetHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapLongInnerBitsetHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapLongInnerBitsetHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapLongInnerBitsetHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapLongInnerBitsetHelperPubSubType::register_type_object_representation() +{ + register_MapLongInnerBitsetHelper_type_identifier(type_identifiers_); +} + +MapULongShortPubSubType::MapULongShortPubSubType() +{ + set_name("MapULongShort"); + uint32_t type_size = MapULongShort_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongShort_max_key_cdr_typesize > 16 ? MapULongShort_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapULongShortPubSubType::~MapULongShortPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapULongShortPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapULongShort* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -12706,6 +14188,25 @@ void MapULongShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12867,6 +14368,25 @@ void MapULongUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13028,6 +14548,25 @@ void MapULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13189,6 +14728,25 @@ void MapULongULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13350,6 +14908,25 @@ void MapKeyULongValueLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapKeyULongValueLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapKeyULongValueLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapKeyULongValueLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13511,6 +15088,25 @@ void MapULongULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13672,6 +15268,25 @@ void MapULongFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13833,6 +15448,25 @@ void MapULongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13994,6 +15628,25 @@ void MapKeyULongValueLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapKeyULongValueLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapKeyULongValueLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapKeyULongValueLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14155,6 +15808,25 @@ void MapULongBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14316,6 +15988,25 @@ void MapULongOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14477,6 +16168,25 @@ void MapULongCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -14639,7 +16349,7 @@ void MapULongWCharPubSubType::delete_data( } bool MapULongWCharPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -14648,158 +16358,16 @@ bool MapULongWCharPubSubType::compute_key( return false; } - const MapULongWChar* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongWChar_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongWChar_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapULongWCharPubSubType::register_type_object_representation() -{ - register_MapULongWChar_type_identifier(type_identifiers_); -} - -MapULongStringPubSubType::MapULongStringPubSubType() -{ - set_name("MapULongString"); - uint32_t type_size = MapULongString_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapULongString_max_key_cdr_typesize > 16 ? MapULongString_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapULongStringPubSubType::~MapULongStringPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapULongStringPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapULongString* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapULongStringPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapULongString* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapULongStringPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapULongWChar data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapULongStringPubSubType::create_data() -{ - return reinterpret_cast(new MapULongString()); -} -void MapULongStringPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapULongStringPubSubType::compute_key( +bool MapULongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -14809,16 +16377,16 @@ bool MapULongStringPubSubType::compute_key( return false; } - const MapULongString* p_type = static_cast(data); + const MapULongWChar* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongString_max_key_cdr_typesize); + MapULongWChar_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongString_max_key_cdr_typesize > 16) + if (force_md5 || MapULongWChar_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -14838,24 +16406,24 @@ bool MapULongStringPubSubType::compute_key( return true; } -void MapULongStringPubSubType::register_type_object_representation() +void MapULongWCharPubSubType::register_type_object_representation() { - register_MapULongString_type_identifier(type_identifiers_); + register_MapULongWChar_type_identifier(type_identifiers_); } -MapULongWStringPubSubType::MapULongWStringPubSubType() +MapULongStringPubSubType::MapULongStringPubSubType() { - set_name("MapULongWString"); - uint32_t type_size = MapULongWString_max_cdr_typesize; + set_name("MapULongString"); + uint32_t type_size = MapULongString_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapULongWString_max_key_cdr_typesize > 16 ? MapULongWString_max_key_cdr_typesize : 16; + uint32_t key_length = MapULongString_max_key_cdr_typesize > 16 ? MapULongString_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapULongWStringPubSubType::~MapULongWStringPubSubType() +MapULongStringPubSubType::~MapULongStringPubSubType() { if (key_buffer_ != nullptr) { @@ -14863,12 +16431,192 @@ MapULongWStringPubSubType::~MapULongWStringPubSubType() } } -bool MapULongWStringPubSubType::serialize( +bool MapULongStringPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapULongWString* p_type = static_cast(data); + const MapULongString* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapULongStringPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapULongString* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapULongStringPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapULongStringPubSubType::create_data() +{ + return reinterpret_cast(new MapULongString()); +} + +void MapULongStringPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapULongStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapULongStringPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapULongString* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapULongString_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::serialize_key(ser, *p_type); + if (force_md5 || MapULongString_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapULongStringPubSubType::register_type_object_representation() +{ + register_MapULongString_type_identifier(type_identifiers_); +} + +MapULongWStringPubSubType::MapULongWStringPubSubType() +{ + set_name("MapULongWString"); + uint32_t type_size = MapULongWString_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongWString_max_key_cdr_typesize > 16 ? MapULongWString_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapULongWStringPubSubType::~MapULongWStringPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapULongWStringPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapULongWString* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -14960,6 +16708,25 @@ void MapULongWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15121,6 +16888,25 @@ void MapULongInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15282,6 +17068,25 @@ void MapULongInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15443,6 +17248,25 @@ void MapULongInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15604,6 +17428,25 @@ void MapULongInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15765,6 +17608,25 @@ void MapULongInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -15926,6 +17788,25 @@ void MapULongInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16087,6 +17968,25 @@ void MapULongInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16248,6 +18148,25 @@ void MapULongInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16409,6 +18328,25 @@ void MapULongInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16570,6 +18508,25 @@ void MapULongInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16731,6 +18688,25 @@ void MapULongInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -16893,7 +18869,7 @@ void MapLongLongShortPubSubType::delete_data( } bool MapLongLongShortPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -16902,158 +18878,16 @@ bool MapLongLongShortPubSubType::compute_key( return false; } - const MapLongLongShort* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongLongShort_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongLongShort_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapLongLongShortPubSubType::register_type_object_representation() -{ - register_MapLongLongShort_type_identifier(type_identifiers_); -} - -MapLongLongUShortPubSubType::MapLongLongUShortPubSubType() -{ - set_name("MapLongLongUShort"); - uint32_t type_size = MapLongLongUShort_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapLongLongUShort_max_key_cdr_typesize > 16 ? MapLongLongUShort_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapLongLongUShortPubSubType::~MapLongLongUShortPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapLongLongUShortPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapLongLongUShort* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapLongLongUShortPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapLongLongUShort* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapLongLongUShortPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapLongLongShort data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapLongLongUShortPubSubType::create_data() -{ - return reinterpret_cast(new MapLongLongUShort()); -} -void MapLongLongUShortPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapLongLongUShortPubSubType::compute_key( +bool MapLongLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -17063,16 +18897,16 @@ bool MapLongLongUShortPubSubType::compute_key( return false; } - const MapLongLongUShort* p_type = static_cast(data); + const MapLongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongLongUShort_max_key_cdr_typesize); + MapLongLongShort_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongLongUShort_max_key_cdr_typesize > 16) + if (force_md5 || MapLongLongShort_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -17092,24 +18926,24 @@ bool MapLongLongUShortPubSubType::compute_key( return true; } -void MapLongLongUShortPubSubType::register_type_object_representation() +void MapLongLongShortPubSubType::register_type_object_representation() { - register_MapLongLongUShort_type_identifier(type_identifiers_); + register_MapLongLongShort_type_identifier(type_identifiers_); } -MapLongLongKeyLongValuePubSubType::MapLongLongKeyLongValuePubSubType() +MapLongLongUShortPubSubType::MapLongLongUShortPubSubType() { - set_name("MapLongLongKeyLongValue"); - uint32_t type_size = MapLongLongKeyLongValue_max_cdr_typesize; + set_name("MapLongLongUShort"); + uint32_t type_size = MapLongLongUShort_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapLongLongKeyLongValue_max_key_cdr_typesize > 16 ? MapLongLongKeyLongValue_max_key_cdr_typesize : 16; + uint32_t key_length = MapLongLongUShort_max_key_cdr_typesize > 16 ? MapLongLongUShort_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapLongLongKeyLongValuePubSubType::~MapLongLongKeyLongValuePubSubType() +MapLongLongUShortPubSubType::~MapLongLongUShortPubSubType() { if (key_buffer_ != nullptr) { @@ -17117,12 +18951,192 @@ MapLongLongKeyLongValuePubSubType::~MapLongLongKeyLongValuePubSubType() } } -bool MapLongLongKeyLongValuePubSubType::serialize( +bool MapLongLongUShortPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapLongLongKeyLongValue* p_type = static_cast(data); + const MapLongLongUShort* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapLongLongUShortPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapLongLongUShort* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapLongLongUShortPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapLongLongUShortPubSubType::create_data() +{ + return reinterpret_cast(new MapLongLongUShort()); +} + +void MapLongLongUShortPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapLongLongUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapLongLongUShortPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapLongLongUShort* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapLongLongUShort_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::serialize_key(ser, *p_type); + if (force_md5 || MapLongLongUShort_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapLongLongUShortPubSubType::register_type_object_representation() +{ + register_MapLongLongUShort_type_identifier(type_identifiers_); +} + +MapLongLongKeyLongValuePubSubType::MapLongLongKeyLongValuePubSubType() +{ + set_name("MapLongLongKeyLongValue"); + uint32_t type_size = MapLongLongKeyLongValue_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongKeyLongValue_max_key_cdr_typesize > 16 ? MapLongLongKeyLongValue_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapLongLongKeyLongValuePubSubType::~MapLongLongKeyLongValuePubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapLongLongKeyLongValuePubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapLongLongKeyLongValue* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -17214,6 +19228,25 @@ void MapLongLongKeyLongValuePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongKeyLongValuePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongKeyLongValue data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongKeyLongValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -17375,6 +19408,25 @@ void MapLongLongULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -17536,6 +19588,25 @@ void MapLongLongLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -17697,6 +19768,25 @@ void MapLongLongULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -17858,6 +19948,25 @@ void MapLongLongFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18019,6 +20128,25 @@ void MapLongLongKeyDoubleValuePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongKeyDoubleValuePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongKeyDoubleValue data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongKeyDoubleValuePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18180,6 +20308,25 @@ void MapLongLongLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18341,6 +20488,25 @@ void MapLongLongBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18502,6 +20668,25 @@ void MapLongLongOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18663,6 +20848,25 @@ void MapLongLongCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18824,6 +21028,25 @@ void MapLongLongWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -18985,6 +21208,25 @@ void MapLongLongStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -19147,7 +21389,7 @@ void MapLongLongWStringPubSubType::delete_data( } bool MapLongLongWStringPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -19156,158 +21398,16 @@ bool MapLongLongWStringPubSubType::compute_key( return false; } - const MapLongLongWString* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongLongWString_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongLongWString_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapLongLongWStringPubSubType::register_type_object_representation() -{ - register_MapLongLongWString_type_identifier(type_identifiers_); -} - -MapLongLongInnerAliasBoundedStringHelperPubSubType::MapLongLongInnerAliasBoundedStringHelperPubSubType() -{ - set_name("MapLongLongInnerAliasBoundedStringHelper"); - uint32_t type_size = MapLongLongInnerAliasBoundedStringHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapLongLongInnerAliasBoundedStringHelperPubSubType::~MapLongLongInnerAliasBoundedStringHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapLongLongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapLongLongWString data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapLongLongInnerAliasBoundedStringHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapLongLongInnerAliasBoundedStringHelper()); -} -void MapLongLongInnerAliasBoundedStringHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( +bool MapLongLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -19317,16 +21417,16 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( return false; } - const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); + const MapLongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize); + MapLongLongWString_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::serialize_key(ser, *p_type); - if (force_md5 || MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapLongLongWString_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -19346,24 +21446,24 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( return true; } -void MapLongLongInnerAliasBoundedStringHelperPubSubType::register_type_object_representation() +void MapLongLongWStringPubSubType::register_type_object_representation() { - register_MapLongLongInnerAliasBoundedStringHelper_type_identifier(type_identifiers_); + register_MapLongLongWString_type_identifier(type_identifiers_); } -MapLongLongInnerAliasBoundedWStringHelperPubSubType::MapLongLongInnerAliasBoundedWStringHelperPubSubType() +MapLongLongInnerAliasBoundedStringHelperPubSubType::MapLongLongInnerAliasBoundedStringHelperPubSubType() { - set_name("MapLongLongInnerAliasBoundedWStringHelper"); - uint32_t type_size = MapLongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; + set_name("MapLongLongInnerAliasBoundedStringHelper"); + uint32_t type_size = MapLongLongInnerAliasBoundedStringHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapLongLongInnerAliasBoundedWStringHelperPubSubType::~MapLongLongInnerAliasBoundedWStringHelperPubSubType() +MapLongLongInnerAliasBoundedStringHelperPubSubType::~MapLongLongInnerAliasBoundedStringHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -19371,12 +21471,192 @@ MapLongLongInnerAliasBoundedWStringHelperPubSubType::~MapLongLongInnerAliasBound } } -bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( +bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapLongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); + const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapLongLongInnerAliasBoundedStringHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapLongLongInnerAliasBoundedStringHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapLongLongInnerAliasBoundedStringHelper()); +} + +void MapLongLongInnerAliasBoundedStringHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapLongLongInnerAliasBoundedStringHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapLongLongInnerAliasBoundedStringHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapLongLongInnerAliasBoundedStringHelperPubSubType::register_type_object_representation() +{ + register_MapLongLongInnerAliasBoundedStringHelper_type_identifier(type_identifiers_); +} + +MapLongLongInnerAliasBoundedWStringHelperPubSubType::MapLongLongInnerAliasBoundedWStringHelperPubSubType() +{ + set_name("MapLongLongInnerAliasBoundedWStringHelper"); + uint32_t type_size = MapLongLongInnerAliasBoundedWStringHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16 ? MapLongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapLongLongInnerAliasBoundedWStringHelperPubSubType::~MapLongLongInnerAliasBoundedWStringHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapLongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -19468,6 +21748,25 @@ void MapLongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -19629,6 +21928,25 @@ void MapLongLongInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -19790,6 +22108,25 @@ void MapLongLongInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -19951,6 +22288,25 @@ void MapLongLongInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20112,6 +22468,25 @@ void MapLongLongInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20273,6 +22648,25 @@ void MapLongLongInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20434,6 +22828,25 @@ void MapLongLongInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20595,6 +23008,25 @@ void MapLongLongInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20756,6 +23188,25 @@ void MapLongLongInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -20917,6 +23368,25 @@ void MapLongLongInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapLongLongInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapLongLongInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapLongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -21078,6 +23548,25 @@ void MapULongLongShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -21239,6 +23728,25 @@ void MapULongLongUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -21401,7 +23909,7 @@ void MapULongLongLongPubSubType::delete_data( } bool MapULongLongLongPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -21410,158 +23918,16 @@ bool MapULongLongLongPubSubType::compute_key( return false; } - const MapULongLongLong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongLongLong_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongLongLong_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapULongLongLongPubSubType::register_type_object_representation() -{ - register_MapULongLongLong_type_identifier(type_identifiers_); -} - -MapULongLongULongPubSubType::MapULongLongULongPubSubType() -{ - set_name("MapULongLongULong"); - uint32_t type_size = MapULongLongULong_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapULongLongULong_max_key_cdr_typesize > 16 ? MapULongLongULong_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapULongLongULongPubSubType::~MapULongLongULongPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapULongLongULongPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapULongLongULong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapULongLongULongPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapULongLongULong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapULongLongULongPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapULongLongLong data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapULongLongULongPubSubType::create_data() -{ - return reinterpret_cast(new MapULongLongULong()); -} -void MapULongLongULongPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapULongLongULongPubSubType::compute_key( +bool MapULongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -21571,16 +23937,16 @@ bool MapULongLongULongPubSubType::compute_key( return false; } - const MapULongLongULong* p_type = static_cast(data); + const MapULongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongLongULong_max_key_cdr_typesize); + MapULongLongLong_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongLongULong_max_key_cdr_typesize > 16) + if (force_md5 || MapULongLongLong_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -21600,24 +23966,24 @@ bool MapULongLongULongPubSubType::compute_key( return true; } -void MapULongLongULongPubSubType::register_type_object_representation() +void MapULongLongLongPubSubType::register_type_object_representation() { - register_MapULongLongULong_type_identifier(type_identifiers_); + register_MapULongLongLong_type_identifier(type_identifiers_); } -MapULongLongLongLongPubSubType::MapULongLongLongLongPubSubType() +MapULongLongULongPubSubType::MapULongLongULongPubSubType() { - set_name("MapULongLongLongLong"); - uint32_t type_size = MapULongLongLongLong_max_cdr_typesize; + set_name("MapULongLongULong"); + uint32_t type_size = MapULongLongULong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapULongLongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLongLong_max_key_cdr_typesize : 16; + uint32_t key_length = MapULongLongULong_max_key_cdr_typesize > 16 ? MapULongLongULong_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapULongLongLongLongPubSubType::~MapULongLongLongLongPubSubType() +MapULongLongULongPubSubType::~MapULongLongULongPubSubType() { if (key_buffer_ != nullptr) { @@ -21625,12 +23991,192 @@ MapULongLongLongLongPubSubType::~MapULongLongLongLongPubSubType() } } -bool MapULongLongLongLongPubSubType::serialize( +bool MapULongLongULongPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapULongLongLongLong* p_type = static_cast(data); + const MapULongLongULong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapULongLongULongPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapULongLongULong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapULongLongULongPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapULongLongULongPubSubType::create_data() +{ + return reinterpret_cast(new MapULongLongULong()); +} + +void MapULongLongULongPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapULongLongULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapULongLongULongPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapULongLongULong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapULongLongULong_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::serialize_key(ser, *p_type); + if (force_md5 || MapULongLongULong_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapULongLongULongPubSubType::register_type_object_representation() +{ + register_MapULongLongULong_type_identifier(type_identifiers_); +} + +MapULongLongLongLongPubSubType::MapULongLongLongLongPubSubType() +{ + set_name("MapULongLongLongLong"); + uint32_t type_size = MapULongLongLongLong_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongLongLong_max_key_cdr_typesize > 16 ? MapULongLongLongLong_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapULongLongLongLongPubSubType::~MapULongLongLongLongPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapULongLongLongLongPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapULongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -21722,6 +24268,25 @@ void MapULongLongLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -21883,6 +24448,25 @@ void MapULongLongULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22044,6 +24628,25 @@ void MapULongLongFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22205,6 +24808,25 @@ void MapKeyULongLongValueDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapKeyULongLongValueDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapKeyULongLongValueDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapKeyULongLongValueDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22366,6 +24988,25 @@ void MapULongLongLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22527,6 +25168,25 @@ void MapULongLongBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22688,6 +25348,25 @@ void MapULongLongOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -22849,6 +25528,25 @@ void MapULongLongCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -23010,6 +25708,25 @@ void MapULongLongWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -23171,6 +25888,25 @@ void MapULongLongStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -23332,6 +26068,25 @@ void MapULongLongWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -23493,6 +26248,25 @@ void MapULongLongInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -23655,7 +26429,7 @@ void MapULongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -23664,158 +26438,16 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( return false; } - const MapULongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongLongInnerAliasBoundedWStringHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapULongLongInnerAliasBoundedWStringHelperPubSubType::register_type_object_representation() -{ - register_MapULongLongInnerAliasBoundedWStringHelper_type_identifier(type_identifiers_); -} - -MapULongLongInnerEnumHelperPubSubType::MapULongLongInnerEnumHelperPubSubType() -{ - set_name("MapULongLongInnerEnumHelper"); - uint32_t type_size = MapULongLongInnerEnumHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerEnumHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapULongLongInnerEnumHelperPubSubType::~MapULongLongInnerEnumHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapULongLongInnerEnumHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapULongLongInnerEnumHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapULongLongInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapULongLongInnerEnumHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapULongLongInnerEnumHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapULongLongInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapULongLongInnerEnumHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapULongLongInnerEnumHelper()); -} -void MapULongLongInnerEnumHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapULongLongInnerEnumHelperPubSubType::compute_key( +bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -23825,16 +26457,16 @@ bool MapULongLongInnerEnumHelperPubSubType::compute_key( return false; } - const MapULongLongInnerEnumHelper* p_type = static_cast(data); + const MapULongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapULongLongInnerEnumHelper_max_key_cdr_typesize); + MapULongLongInnerAliasBoundedWStringHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapULongLongInnerAliasBoundedWStringHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -23854,24 +26486,24 @@ bool MapULongLongInnerEnumHelperPubSubType::compute_key( return true; } -void MapULongLongInnerEnumHelperPubSubType::register_type_object_representation() +void MapULongLongInnerAliasBoundedWStringHelperPubSubType::register_type_object_representation() { - register_MapULongLongInnerEnumHelper_type_identifier(type_identifiers_); + register_MapULongLongInnerAliasBoundedWStringHelper_type_identifier(type_identifiers_); } -MapULongLongInnerBitMaskHelperPubSubType::MapULongLongInnerBitMaskHelperPubSubType() +MapULongLongInnerEnumHelperPubSubType::MapULongLongInnerEnumHelperPubSubType() { - set_name("MapULongLongInnerBitMaskHelper"); - uint32_t type_size = MapULongLongInnerBitMaskHelper_max_cdr_typesize; + set_name("MapULongLongInnerEnumHelper"); + uint32_t type_size = MapULongLongInnerEnumHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapULongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerEnumHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapULongLongInnerBitMaskHelperPubSubType::~MapULongLongInnerBitMaskHelperPubSubType() +MapULongLongInnerEnumHelperPubSubType::~MapULongLongInnerEnumHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -23879,12 +26511,192 @@ MapULongLongInnerBitMaskHelperPubSubType::~MapULongLongInnerBitMaskHelperPubSubT } } -bool MapULongLongInnerBitMaskHelperPubSubType::serialize( +bool MapULongLongInnerEnumHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapULongLongInnerBitMaskHelper* p_type = static_cast(data); + const MapULongLongInnerEnumHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapULongLongInnerEnumHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapULongLongInnerEnumHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapULongLongInnerEnumHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapULongLongInnerEnumHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapULongLongInnerEnumHelper()); +} + +void MapULongLongInnerEnumHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapULongLongInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapULongLongInnerEnumHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapULongLongInnerEnumHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapULongLongInnerEnumHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapULongLongInnerEnumHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapULongLongInnerEnumHelperPubSubType::register_type_object_representation() +{ + register_MapULongLongInnerEnumHelper_type_identifier(type_identifiers_); +} + +MapULongLongInnerBitMaskHelperPubSubType::MapULongLongInnerBitMaskHelperPubSubType() +{ + set_name("MapULongLongInnerBitMaskHelper"); + uint32_t type_size = MapULongLongInnerBitMaskHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapULongLongInnerBitMaskHelper_max_key_cdr_typesize > 16 ? MapULongLongInnerBitMaskHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapULongLongInnerBitMaskHelperPubSubType::~MapULongLongInnerBitMaskHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapULongLongInnerBitMaskHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapULongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -23976,6 +26788,25 @@ void MapULongLongInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24137,6 +26968,25 @@ void MapULongLongInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24298,6 +27148,25 @@ void MapULongLongInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24459,6 +27328,25 @@ void MapULongLongInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24620,6 +27508,25 @@ void MapULongLongInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24781,6 +27688,25 @@ void MapULongLongInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -24942,6 +27868,25 @@ void MapULongLongInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25103,6 +28048,25 @@ void MapULongLongInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapULongLongInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapULongLongInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapULongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25264,6 +28228,25 @@ void MapStringShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25425,6 +28408,25 @@ void MapStringUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25586,6 +28588,25 @@ void MapStringLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25747,6 +28768,25 @@ void MapStringULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -25909,7 +28949,7 @@ void MapStringLongLongPubSubType::delete_data( } bool MapStringLongLongPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -25918,158 +28958,16 @@ bool MapStringLongLongPubSubType::compute_key( return false; } - const MapStringLongLong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapStringLongLong_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::serialize_key(ser, *p_type); - if (force_md5 || MapStringLongLong_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapStringLongLongPubSubType::register_type_object_representation() -{ - register_MapStringLongLong_type_identifier(type_identifiers_); -} - -MapStringULongLongPubSubType::MapStringULongLongPubSubType() -{ - set_name("MapStringULongLong"); - uint32_t type_size = MapStringULongLong_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapStringULongLong_max_key_cdr_typesize > 16 ? MapStringULongLong_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapStringULongLongPubSubType::~MapStringULongLongPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapStringULongLongPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapStringULongLong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapStringULongLongPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapStringULongLong* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapStringULongLongPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapStringLongLong data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapStringULongLongPubSubType::create_data() -{ - return reinterpret_cast(new MapStringULongLong()); -} -void MapStringULongLongPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapStringULongLongPubSubType::compute_key( +bool MapStringLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -26079,16 +28977,16 @@ bool MapStringULongLongPubSubType::compute_key( return false; } - const MapStringULongLong* p_type = static_cast(data); + const MapStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapStringULongLong_max_key_cdr_typesize); + MapStringLongLong_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::serialize_key(ser, *p_type); - if (force_md5 || MapStringULongLong_max_key_cdr_typesize > 16) + if (force_md5 || MapStringLongLong_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -26108,24 +29006,24 @@ bool MapStringULongLongPubSubType::compute_key( return true; } -void MapStringULongLongPubSubType::register_type_object_representation() +void MapStringLongLongPubSubType::register_type_object_representation() { - register_MapStringULongLong_type_identifier(type_identifiers_); + register_MapStringLongLong_type_identifier(type_identifiers_); } -MapStringFloatPubSubType::MapStringFloatPubSubType() +MapStringULongLongPubSubType::MapStringULongLongPubSubType() { - set_name("MapStringFloat"); - uint32_t type_size = MapStringFloat_max_cdr_typesize; + set_name("MapStringULongLong"); + uint32_t type_size = MapStringULongLong_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapStringFloat_max_key_cdr_typesize > 16 ? MapStringFloat_max_key_cdr_typesize : 16; + uint32_t key_length = MapStringULongLong_max_key_cdr_typesize > 16 ? MapStringULongLong_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapStringFloatPubSubType::~MapStringFloatPubSubType() +MapStringULongLongPubSubType::~MapStringULongLongPubSubType() { if (key_buffer_ != nullptr) { @@ -26133,12 +29031,192 @@ MapStringFloatPubSubType::~MapStringFloatPubSubType() } } -bool MapStringFloatPubSubType::serialize( +bool MapStringULongLongPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapStringFloat* p_type = static_cast(data); + const MapStringULongLong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapStringULongLongPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapStringULongLong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapStringULongLongPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapStringULongLongPubSubType::create_data() +{ + return reinterpret_cast(new MapStringULongLong()); +} + +void MapStringULongLongPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapStringULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapStringULongLongPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapStringULongLong* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapStringULongLong_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::serialize_key(ser, *p_type); + if (force_md5 || MapStringULongLong_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapStringULongLongPubSubType::register_type_object_representation() +{ + register_MapStringULongLong_type_identifier(type_identifiers_); +} + +MapStringFloatPubSubType::MapStringFloatPubSubType() +{ + set_name("MapStringFloat"); + uint32_t type_size = MapStringFloat_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringFloat_max_key_cdr_typesize > 16 ? MapStringFloat_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapStringFloatPubSubType::~MapStringFloatPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapStringFloatPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -26230,6 +29308,25 @@ void MapStringFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -26391,6 +29488,25 @@ void MapStringDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -26552,6 +29668,25 @@ void MapStringLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -26713,6 +29848,25 @@ void MapStringBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -26874,6 +30028,25 @@ void MapStringOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27035,6 +30208,25 @@ void MapStringCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27196,6 +30388,25 @@ void MapStringWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27357,6 +30568,25 @@ void MapStringStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27518,6 +30748,25 @@ void MapStringWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27679,6 +30928,25 @@ void MapStringInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -27840,6 +31108,25 @@ void MapStringInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -28001,6 +31288,25 @@ void MapStringInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -28163,7 +31469,7 @@ void MapStringInnerBitMaskHelperPubSubType::delete_data( } bool MapStringInnerBitMaskHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -28172,158 +31478,16 @@ bool MapStringInnerBitMaskHelperPubSubType::compute_key( return false; } - const MapStringInnerBitMaskHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapStringInnerBitMaskHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapStringInnerBitMaskHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapStringInnerBitMaskHelperPubSubType::register_type_object_representation() -{ - register_MapStringInnerBitMaskHelper_type_identifier(type_identifiers_); -} - -MapStringInnerAliasHelperPubSubType::MapStringInnerAliasHelperPubSubType() -{ - set_name("MapStringInnerAliasHelper"); - uint32_t type_size = MapStringInnerAliasHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapStringInnerAliasHelperPubSubType::~MapStringInnerAliasHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapStringInnerAliasHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapStringInnerAliasHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapStringInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapStringInnerAliasHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapStringInnerAliasHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapStringInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapStringInnerAliasHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapStringInnerAliasHelper()); -} -void MapStringInnerAliasHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapStringInnerAliasHelperPubSubType::compute_key( +bool MapStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -28333,16 +31497,16 @@ bool MapStringInnerAliasHelperPubSubType::compute_key( return false; } - const MapStringInnerAliasHelper* p_type = static_cast(data); + const MapStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapStringInnerAliasHelper_max_key_cdr_typesize); + MapStringInnerBitMaskHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapStringInnerAliasHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapStringInnerBitMaskHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -28362,24 +31526,24 @@ bool MapStringInnerAliasHelperPubSubType::compute_key( return true; } -void MapStringInnerAliasHelperPubSubType::register_type_object_representation() +void MapStringInnerBitMaskHelperPubSubType::register_type_object_representation() { - register_MapStringInnerAliasHelper_type_identifier(type_identifiers_); + register_MapStringInnerBitMaskHelper_type_identifier(type_identifiers_); } -MapStringInnerAliasArrayHelperPubSubType::MapStringInnerAliasArrayHelperPubSubType() +MapStringInnerAliasHelperPubSubType::MapStringInnerAliasHelperPubSubType() { - set_name("MapStringInnerAliasArrayHelper"); - uint32_t type_size = MapStringInnerAliasArrayHelper_max_cdr_typesize; + set_name("MapStringInnerAliasHelper"); + uint32_t type_size = MapStringInnerAliasHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapStringInnerAliasHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapStringInnerAliasArrayHelperPubSubType::~MapStringInnerAliasArrayHelperPubSubType() +MapStringInnerAliasHelperPubSubType::~MapStringInnerAliasHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -28387,12 +31551,192 @@ MapStringInnerAliasArrayHelperPubSubType::~MapStringInnerAliasArrayHelperPubSubT } } -bool MapStringInnerAliasArrayHelperPubSubType::serialize( +bool MapStringInnerAliasHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapStringInnerAliasArrayHelper* p_type = static_cast(data); + const MapStringInnerAliasHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapStringInnerAliasHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapStringInnerAliasHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapStringInnerAliasHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapStringInnerAliasHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapStringInnerAliasHelper()); +} + +void MapStringInnerAliasHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapStringInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapStringInnerAliasHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapStringInnerAliasHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapStringInnerAliasHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapStringInnerAliasHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapStringInnerAliasHelperPubSubType::register_type_object_representation() +{ + register_MapStringInnerAliasHelper_type_identifier(type_identifiers_); +} + +MapStringInnerAliasArrayHelperPubSubType::MapStringInnerAliasArrayHelperPubSubType() +{ + set_name("MapStringInnerAliasArrayHelper"); + uint32_t type_size = MapStringInnerAliasArrayHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStringInnerAliasArrayHelper_max_key_cdr_typesize > 16 ? MapStringInnerAliasArrayHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapStringInnerAliasArrayHelperPubSubType::~MapStringInnerAliasArrayHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapStringInnerAliasArrayHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -28484,6 +31828,25 @@ void MapStringInnerAliasArrayHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -28645,6 +32008,25 @@ void MapStringInnerAliasSequenceHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -28806,6 +32188,25 @@ void MapStringInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -28967,6 +32368,25 @@ void MapStringInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29128,6 +32548,25 @@ void MapStringInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29289,6 +32728,25 @@ void MapStringInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapStringInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStringInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapStringInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29450,6 +32908,25 @@ void MapWStringShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29611,6 +33088,25 @@ void MapWStringUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29772,6 +33268,25 @@ void MapWStringLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -29933,6 +33448,25 @@ void MapWStringULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -30094,6 +33628,25 @@ void MapWStringLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -30255,6 +33808,25 @@ void MapWStringULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -30417,7 +33989,7 @@ void MapWStringFloatPubSubType::delete_data( } bool MapWStringFloatPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -30426,158 +33998,16 @@ bool MapWStringFloatPubSubType::compute_key( return false; } - const MapWStringFloat* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapWStringFloat_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::serialize_key(ser, *p_type); - if (force_md5 || MapWStringFloat_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapWStringFloatPubSubType::register_type_object_representation() -{ - register_MapWStringFloat_type_identifier(type_identifiers_); -} - -MapWStringDoublePubSubType::MapWStringDoublePubSubType() -{ - set_name("MapWStringDouble"); - uint32_t type_size = MapWStringDouble_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapWStringDouble_max_key_cdr_typesize > 16 ? MapWStringDouble_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapWStringDoublePubSubType::~MapWStringDoublePubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapWStringDoublePubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapWStringDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapWStringDoublePubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapWStringDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapWStringDoublePubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapWStringFloat data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapWStringDoublePubSubType::create_data() -{ - return reinterpret_cast(new MapWStringDouble()); -} -void MapWStringDoublePubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapWStringDoublePubSubType::compute_key( +bool MapWStringFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -30587,16 +34017,16 @@ bool MapWStringDoublePubSubType::compute_key( return false; } - const MapWStringDouble* p_type = static_cast(data); + const MapWStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapWStringDouble_max_key_cdr_typesize); + MapWStringFloat_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::serialize_key(ser, *p_type); - if (force_md5 || MapWStringDouble_max_key_cdr_typesize > 16) + if (force_md5 || MapWStringFloat_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -30616,24 +34046,24 @@ bool MapWStringDoublePubSubType::compute_key( return true; } -void MapWStringDoublePubSubType::register_type_object_representation() +void MapWStringFloatPubSubType::register_type_object_representation() { - register_MapWStringDouble_type_identifier(type_identifiers_); + register_MapWStringFloat_type_identifier(type_identifiers_); } -MapWStringLongDoublePubSubType::MapWStringLongDoublePubSubType() +MapWStringDoublePubSubType::MapWStringDoublePubSubType() { - set_name("MapWStringLongDouble"); - uint32_t type_size = MapWStringLongDouble_max_cdr_typesize; + set_name("MapWStringDouble"); + uint32_t type_size = MapWStringDouble_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapWStringLongDouble_max_key_cdr_typesize > 16 ? MapWStringLongDouble_max_key_cdr_typesize : 16; + uint32_t key_length = MapWStringDouble_max_key_cdr_typesize > 16 ? MapWStringDouble_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapWStringLongDoublePubSubType::~MapWStringLongDoublePubSubType() +MapWStringDoublePubSubType::~MapWStringDoublePubSubType() { if (key_buffer_ != nullptr) { @@ -30641,12 +34071,192 @@ MapWStringLongDoublePubSubType::~MapWStringLongDoublePubSubType() } } -bool MapWStringLongDoublePubSubType::serialize( +bool MapWStringDoublePubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapWStringLongDouble* p_type = static_cast(data); + const MapWStringDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapWStringDoublePubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapWStringDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapWStringDoublePubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapWStringDoublePubSubType::create_data() +{ + return reinterpret_cast(new MapWStringDouble()); +} + +void MapWStringDoublePubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapWStringDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapWStringDoublePubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapWStringDouble* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapWStringDouble_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::serialize_key(ser, *p_type); + if (force_md5 || MapWStringDouble_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapWStringDoublePubSubType::register_type_object_representation() +{ + register_MapWStringDouble_type_identifier(type_identifiers_); +} + +MapWStringLongDoublePubSubType::MapWStringLongDoublePubSubType() +{ + set_name("MapWStringLongDouble"); + uint32_t type_size = MapWStringLongDouble_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringLongDouble_max_key_cdr_typesize > 16 ? MapWStringLongDouble_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapWStringLongDoublePubSubType::~MapWStringLongDoublePubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapWStringLongDoublePubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapWStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -30738,6 +34348,25 @@ void MapWStringLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -30899,6 +34528,25 @@ void MapWStringBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31060,6 +34708,25 @@ void MapWStringOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31221,6 +34888,25 @@ void MapWStringCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31382,6 +35068,25 @@ void MapWStringWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31543,6 +35248,25 @@ void MapWStringStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31704,6 +35428,25 @@ void MapWStringWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -31865,6 +35608,25 @@ void MapWStringInnerAliasBoundedStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -32026,6 +35788,25 @@ void MapWStringInnerAliasBoundedWStringHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -32187,6 +35968,25 @@ void MapWStringInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -32348,6 +36148,25 @@ void MapWStringInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -32509,6 +36328,25 @@ void MapWStringInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -32671,7 +36509,7 @@ void MapWStringInnerAliasArrayHelperPubSubType::delete_data( } bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -32680,158 +36518,16 @@ bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( return false; } - const MapWStringInnerAliasArrayHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapWStringInnerAliasArrayHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapWStringInnerAliasArrayHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapWStringInnerAliasArrayHelperPubSubType::register_type_object_representation() -{ - register_MapWStringInnerAliasArrayHelper_type_identifier(type_identifiers_); -} - -MapWStringInnerAliasSequenceHelperPubSubType::MapWStringInnerAliasSequenceHelperPubSubType() -{ - set_name("MapWStringInnerAliasSequenceHelper"); - uint32_t type_size = MapWStringInnerAliasSequenceHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapWStringInnerAliasSequenceHelperPubSubType::~MapWStringInnerAliasSequenceHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapWStringInnerAliasSequenceHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapWStringInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapWStringInnerAliasSequenceHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapWStringInnerAliasSequenceHelper()); -} -void MapWStringInnerAliasSequenceHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( +bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -32841,16 +36537,16 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( return false; } - const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); + const MapWStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize); + MapWStringInnerAliasArrayHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapWStringInnerAliasArrayHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -32870,24 +36566,24 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( return true; } -void MapWStringInnerAliasSequenceHelperPubSubType::register_type_object_representation() +void MapWStringInnerAliasArrayHelperPubSubType::register_type_object_representation() { - register_MapWStringInnerAliasSequenceHelper_type_identifier(type_identifiers_); + register_MapWStringInnerAliasArrayHelper_type_identifier(type_identifiers_); } -MapWStringInnerAliasMapHelperPubSubType::MapWStringInnerAliasMapHelperPubSubType() +MapWStringInnerAliasSequenceHelperPubSubType::MapWStringInnerAliasSequenceHelperPubSubType() { - set_name("MapWStringInnerAliasMapHelper"); - uint32_t type_size = MapWStringInnerAliasMapHelper_max_cdr_typesize; + set_name("MapWStringInnerAliasSequenceHelper"); + uint32_t type_size = MapWStringInnerAliasSequenceHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapWStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasMapHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapWStringInnerAliasMapHelperPubSubType::~MapWStringInnerAliasMapHelperPubSubType() +MapWStringInnerAliasSequenceHelperPubSubType::~MapWStringInnerAliasSequenceHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -32895,12 +36591,192 @@ MapWStringInnerAliasMapHelperPubSubType::~MapWStringInnerAliasMapHelperPubSubTyp } } -bool MapWStringInnerAliasMapHelperPubSubType::serialize( +bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapWStringInnerAliasMapHelper* p_type = static_cast(data); + const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapWStringInnerAliasSequenceHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapWStringInnerAliasSequenceHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapWStringInnerAliasSequenceHelper()); +} + +void MapWStringInnerAliasSequenceHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapWStringInnerAliasSequenceHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapWStringInnerAliasSequenceHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapWStringInnerAliasSequenceHelperPubSubType::register_type_object_representation() +{ + register_MapWStringInnerAliasSequenceHelper_type_identifier(type_identifiers_); +} + +MapWStringInnerAliasMapHelperPubSubType::MapWStringInnerAliasMapHelperPubSubType() +{ + set_name("MapWStringInnerAliasMapHelper"); + uint32_t type_size = MapWStringInnerAliasMapHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapWStringInnerAliasMapHelper_max_key_cdr_typesize > 16 ? MapWStringInnerAliasMapHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapWStringInnerAliasMapHelperPubSubType::~MapWStringInnerAliasMapHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapWStringInnerAliasMapHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapWStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -32992,6 +36868,25 @@ void MapWStringInnerAliasMapHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33153,6 +37048,25 @@ void MapWStringInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33314,6 +37228,25 @@ void MapWStringInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33475,6 +37408,25 @@ void MapWStringInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapWStringInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapWStringInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapWStringInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33636,6 +37588,25 @@ void MapInnerAliasBoundedStringHelperShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33797,6 +37768,25 @@ void MapInnerAliasBoundedStringHelperUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -33958,6 +37948,25 @@ void MapInnerAliasBoundedStringHelperLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34119,6 +38128,25 @@ void MapInnerAliasBoundedStringHelperULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34280,6 +38308,25 @@ void MapInnerAliasBoundedStringHelperLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34441,6 +38488,25 @@ void MapInnerAliasBoundedStringHelperULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34602,6 +38668,25 @@ void MapInnerAliasBoundedStringHelperFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34763,6 +38848,25 @@ void MapInnerAliasBoundedStringHelperDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -34925,7 +39029,7 @@ void MapInnerAliasBoundedStringHelperLongDoublePubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -34934,158 +39038,16 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( return false; } - const MapInnerAliasBoundedStringHelperLongDouble* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapInnerAliasBoundedStringHelperLongDouble_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::serialize_key(ser, *p_type); - if (force_md5 || MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapInnerAliasBoundedStringHelperLongDoublePubSubType::register_type_object_representation() -{ - register_MapInnerAliasBoundedStringHelperLongDouble_type_identifier(type_identifiers_); -} - -MapInnerAliasBoundedStringHelperBooleanPubSubType::MapInnerAliasBoundedStringHelperBooleanPubSubType() -{ - set_name("MapInnerAliasBoundedStringHelperBoolean"); - uint32_t type_size = MapInnerAliasBoundedStringHelperBoolean_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapInnerAliasBoundedStringHelperBooleanPubSubType::~MapInnerAliasBoundedStringHelperBooleanPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapInnerAliasBoundedStringHelperBooleanPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapInnerAliasBoundedStringHelperLongDouble data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapInnerAliasBoundedStringHelperBooleanPubSubType::create_data() -{ - return reinterpret_cast(new MapInnerAliasBoundedStringHelperBoolean()); -} -void MapInnerAliasBoundedStringHelperBooleanPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( +bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -35095,16 +39057,16 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( return false; } - const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); + const MapInnerAliasBoundedStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize); + MapInnerAliasBoundedStringHelperLongDouble_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::serialize_key(ser, *p_type); - if (force_md5 || MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16) + if (force_md5 || MapInnerAliasBoundedStringHelperLongDouble_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -35124,24 +39086,24 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( return true; } -void MapInnerAliasBoundedStringHelperBooleanPubSubType::register_type_object_representation() +void MapInnerAliasBoundedStringHelperLongDoublePubSubType::register_type_object_representation() { - register_MapInnerAliasBoundedStringHelperBoolean_type_identifier(type_identifiers_); + register_MapInnerAliasBoundedStringHelperLongDouble_type_identifier(type_identifiers_); } -MapInnerAliasBoundedStringHelperOctetPubSubType::MapInnerAliasBoundedStringHelperOctetPubSubType() +MapInnerAliasBoundedStringHelperBooleanPubSubType::MapInnerAliasBoundedStringHelperBooleanPubSubType() { - set_name("MapInnerAliasBoundedStringHelperOctet"); - uint32_t type_size = MapInnerAliasBoundedStringHelperOctet_max_cdr_typesize; + set_name("MapInnerAliasBoundedStringHelperBoolean"); + uint32_t type_size = MapInnerAliasBoundedStringHelperBoolean_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize : 16; + uint32_t key_length = MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapInnerAliasBoundedStringHelperOctetPubSubType::~MapInnerAliasBoundedStringHelperOctetPubSubType() +MapInnerAliasBoundedStringHelperBooleanPubSubType::~MapInnerAliasBoundedStringHelperBooleanPubSubType() { if (key_buffer_ != nullptr) { @@ -35149,12 +39111,192 @@ MapInnerAliasBoundedStringHelperOctetPubSubType::~MapInnerAliasBoundedStringHelp } } -bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( +bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapInnerAliasBoundedStringHelperOctet* p_type = static_cast(data); + const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapInnerAliasBoundedStringHelperBooleanPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapInnerAliasBoundedStringHelperBooleanPubSubType::create_data() +{ + return reinterpret_cast(new MapInnerAliasBoundedStringHelperBoolean()); +} + +void MapInnerAliasBoundedStringHelperBooleanPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapInnerAliasBoundedStringHelperBoolean_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::serialize_key(ser, *p_type); + if (force_md5 || MapInnerAliasBoundedStringHelperBoolean_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapInnerAliasBoundedStringHelperBooleanPubSubType::register_type_object_representation() +{ + register_MapInnerAliasBoundedStringHelperBoolean_type_identifier(type_identifiers_); +} + +MapInnerAliasBoundedStringHelperOctetPubSubType::MapInnerAliasBoundedStringHelperOctetPubSubType() +{ + set_name("MapInnerAliasBoundedStringHelperOctet"); + uint32_t type_size = MapInnerAliasBoundedStringHelperOctet_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperOctet_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapInnerAliasBoundedStringHelperOctetPubSubType::~MapInnerAliasBoundedStringHelperOctetPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapInnerAliasBoundedStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -35246,6 +39388,25 @@ void MapInnerAliasBoundedStringHelperOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -35407,6 +39568,25 @@ void MapInnerAliasBoundedStringHelperCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -35568,6 +39748,25 @@ void MapInnerAliasBoundedStringHelperWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -35729,6 +39928,25 @@ void MapInnerAliasBoundedStringHelperStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -35890,6 +40108,25 @@ void MapInnerAliasBoundedStringHelperWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36051,6 +40288,25 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::de delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36212,6 +40468,25 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::d delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36373,6 +40648,25 @@ void MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36534,6 +40828,25 @@ void MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36695,6 +41008,25 @@ void MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -36856,6 +41188,25 @@ void MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::delete_dat delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -37017,6 +41368,25 @@ void MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::delete_ delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -37179,7 +41549,7 @@ void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( - const void* const data, + SerializedPayload_t* payload, InstanceHandle_t* handle, bool force_md5) { @@ -37188,158 +41558,16 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( return false; } - const MapInnerAliasBoundedStringHelperInnerAliasMapHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapInnerAliasBoundedStringHelperInnerAliasMapHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16) - { - md5_.init(); - md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); - md5_.finalize(); - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = md5_.digest[i]; - } - } - else - { - for (uint8_t i = 0; i < 16; ++i) - { - handle->value[i] = key_buffer_[i]; - } - } - return true; -} - -void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::register_type_object_representation() -{ - register_MapInnerAliasBoundedStringHelperInnerAliasMapHelper_type_identifier(type_identifiers_); -} - -MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() -{ - set_name("MapInnerAliasBoundedStringHelperInnerUnionHelper"); - uint32_t type_size = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_cdr_typesize; - type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; - key_buffer_ = reinterpret_cast(malloc(key_length)); - memset(key_buffer_, 0, key_length); -} - -MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() -{ - if (key_buffer_ != nullptr) - { - free(key_buffer_); - } -} - -bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( - const void* const data, - SerializedPayload_t* payload, - DataRepresentationId_t data_representation) -{ - const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); - // Object that serializes the data. - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - ser.set_encoding_flag( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : - eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); - - try - { - // Serialize encapsulation - ser.serialize_encapsulation(); - // Serialize the object. - ser << *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); - return true; -} - -bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, - void* data) -{ - try - { - // Convert DATA to pointer of your type - MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); - - // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); - - // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); - - // Deserialize encapsulation. - deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; - - // Deserialize the object. - deser >> *p_type; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return false; - } - - return true; -} - -uint32_t MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::calculate_serialized_size( - const void* const data, - DataRepresentationId_t data_representation) -{ - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) + MapInnerAliasBoundedStringHelperInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) { - return 0; + return compute_key(static_cast(&data), handle, force_md5); } -} - -void* MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::create_data() -{ - return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerUnionHelper()); -} -void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::delete_data( - void* data) -{ - delete(reinterpret_cast(data)); + return false; } -bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( +bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) @@ -37349,16 +41577,16 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( return false; } - const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); + const MapInnerAliasBoundedStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize); + MapInnerAliasBoundedStringHelperInnerAliasMapHelper_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::serialize_key(ser, *p_type); - if (force_md5 || MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16) + if (force_md5 || MapInnerAliasBoundedStringHelperInnerAliasMapHelper_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -37378,24 +41606,24 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( return true; } -void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::register_type_object_representation() +void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::register_type_object_representation() { - register_MapInnerAliasBoundedStringHelperInnerUnionHelper_type_identifier(type_identifiers_); + register_MapInnerAliasBoundedStringHelperInnerAliasMapHelper_type_identifier(type_identifiers_); } -MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() +MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() { - set_name("MapInnerAliasBoundedStringHelperInnerStructureHelper"); - uint32_t type_size = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_cdr_typesize; + set_name("MapInnerAliasBoundedStringHelperInnerUnionHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } -MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() +MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType() { if (key_buffer_ != nullptr) { @@ -37403,12 +41631,192 @@ MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBo } } -bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( +bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( const void* const data, SerializedPayload_t* payload, DataRepresentationId_t data_representation) { - const MapInnerAliasBoundedStringHelperInnerStructureHelper* p_type = static_cast(data); + const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + // Object that serializes the data. + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); + payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + ser.set_encoding_flag( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : + eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); + + try + { + // Serialize encapsulation + ser.serialize_encapsulation(); + // Serialize the object. + ser << *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + // Get the serialized length + payload->length = static_cast(ser.get_serialized_data_length()); + return true; +} + +bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( + SerializedPayload_t* payload, + void* data) +{ + try + { + // Convert DATA to pointer of your type + MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + + // Object that deserializes the data. + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); + + // Deserialize encapsulation. + deser.read_encapsulation(); + payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + + // Deserialize the object. + deser >> *p_type; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return false; + } + + return true; +} + +uint32_t MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::calculate_serialized_size( + const void* const data, + DataRepresentationId_t data_representation) +{ + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::create_data() +{ + return reinterpret_cast(new MapInnerAliasBoundedStringHelperInnerUnionHelper()); +} + +void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::delete_data( + void* data) +{ + delete(reinterpret_cast(data)); +} + +bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( + const void* const data, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); + + // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), + MapInnerAliasBoundedStringHelperInnerUnionHelper_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::serialize_key(ser, *p_type); + if (force_md5 || MapInnerAliasBoundedStringHelperInnerUnionHelper_max_key_cdr_typesize > 16) + { + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = md5_.digest[i]; + } + } + else + { + for (uint8_t i = 0; i < 16; ++i) + { + handle->value[i] = key_buffer_[i]; + } + } + return true; +} + +void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::register_type_object_representation() +{ + register_MapInnerAliasBoundedStringHelperInnerUnionHelper_type_identifier(type_identifiers_); +} + +MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() +{ + set_name("MapInnerAliasBoundedStringHelperInnerStructureHelper"); + uint32_t type_size = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_cdr_typesize; + type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize > 16 ? MapInnerAliasBoundedStringHelperInnerStructureHelper_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); +} + +MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType() +{ + if (key_buffer_ != nullptr) + { + free(key_buffer_); + } +} + +bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( + const void* const data, + SerializedPayload_t* payload, + DataRepresentationId_t data_representation) +{ + const MapInnerAliasBoundedStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); @@ -37500,6 +41908,25 @@ void MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::delete_data delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -37661,6 +42088,25 @@ void MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedStringHelperInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -37822,6 +42268,25 @@ void MapInnerAliasBoundedWStringHelperShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -37983,6 +42448,25 @@ void MapInnerAliasBoundedWStringHelperUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38144,6 +42628,25 @@ void MapInnerAliasBoundedWStringHelperLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38305,6 +42808,25 @@ void MapInnerAliasBoundedWStringHelperULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38466,6 +42988,25 @@ void MapInnerAliasBoundedWStringHelperLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38627,6 +43168,25 @@ void MapInnerAliasBoundedWStringHelperULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38788,6 +43348,25 @@ void MapInnerAliasBoundedWStringHelperFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -38949,6 +43528,25 @@ void MapInnerAliasBoundedWStringHelperDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39110,6 +43708,25 @@ void MapInnerAliasBoundedWStringHelperLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39271,6 +43888,25 @@ void MapInnerAliasBoundedWStringHelperBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39432,6 +44068,25 @@ void MapInnerAliasBoundedWStringHelperOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39593,6 +44248,25 @@ void MapInnerAliasBoundedWStringHelperCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39754,6 +44428,25 @@ void MapInnerAliasBoundedWStringHelperWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -39915,6 +44608,25 @@ void MapInnerAliasBoundedWStringHelperStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40076,6 +44788,25 @@ void MapInnerAliasBoundedWStringHelperWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40237,6 +44968,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::d delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40398,6 +45148,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40559,6 +45328,25 @@ void MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40720,6 +45508,25 @@ void MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -40881,6 +45688,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41042,6 +45868,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::delete_da delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41203,6 +46048,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::delete delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41364,6 +46228,25 @@ void MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::delete_data delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerAliasMapHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41525,6 +46408,25 @@ void MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41686,6 +46588,25 @@ void MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::delete_dat delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -41847,6 +46768,25 @@ void MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapInnerAliasBoundedWStringHelperInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -42008,6 +46948,25 @@ void BoundedSmallMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedSmallMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedSmallMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedSmallMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -42169,6 +47128,25 @@ void BoundedLargeMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedLargeMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedLargeMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedLargeMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index ca3bf395fc2..2f206938378 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -66,6 +66,11 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2138,6 +2278,11 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2212,6 +2357,11 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2286,6 +2436,11 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2360,6 +2515,11 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2434,6 +2594,11 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2508,6 +2673,11 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2582,6 +2752,11 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2656,6 +2831,11 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2730,6 +2910,11 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2804,6 +2989,11 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2878,6 +3068,11 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2952,6 +3147,11 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3026,6 +3226,11 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3100,6 +3305,11 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3174,6 +3384,11 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3248,6 +3463,11 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3322,6 +3542,11 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3396,6 +3621,11 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3470,6 +3700,11 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3544,6 +3779,11 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3618,6 +3858,11 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3692,6 +3937,11 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3766,6 +4016,11 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3840,6 +4095,11 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3914,6 +4174,11 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3988,6 +4253,11 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4062,6 +4332,11 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4136,6 +4411,11 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4210,6 +4490,11 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4284,6 +4569,11 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4358,6 +4648,11 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4432,6 +4727,11 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4506,6 +4806,11 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4580,6 +4885,11 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4654,6 +4964,11 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4728,6 +5043,11 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4802,6 +5122,11 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4876,6 +5201,11 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4950,6 +5280,11 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5024,6 +5359,11 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5098,6 +5438,11 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5172,6 +5517,11 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5246,6 +5596,11 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5320,6 +5675,11 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5394,6 +5754,11 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5468,6 +5833,11 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5542,6 +5912,11 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5616,6 +5991,11 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5690,6 +6070,11 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5764,6 +6149,11 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5838,6 +6228,11 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5912,6 +6307,11 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5986,6 +6386,11 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6060,6 +6465,11 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6134,6 +6544,11 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6208,6 +6623,11 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6282,6 +6702,11 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6356,6 +6781,11 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6430,6 +6860,11 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6504,6 +6939,11 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6578,6 +7018,11 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6652,6 +7097,11 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6726,6 +7176,11 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6800,6 +7255,11 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6874,6 +7334,11 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -6948,6 +7413,11 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7022,6 +7492,11 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7096,6 +7571,11 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7170,6 +7650,11 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7244,6 +7729,11 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7318,6 +7808,11 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7392,6 +7887,11 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7466,6 +7966,11 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7540,6 +8045,11 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7614,6 +8124,11 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7688,6 +8203,11 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7762,6 +8282,11 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7836,6 +8361,11 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7910,6 +8440,11 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -7984,6 +8519,11 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8058,6 +8598,11 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8132,6 +8677,11 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8206,6 +8756,11 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8280,6 +8835,11 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8354,6 +8914,11 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8428,6 +8993,11 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8502,6 +9072,11 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8576,6 +9151,11 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8650,6 +9230,11 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8724,6 +9309,11 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8798,6 +9388,11 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8872,6 +9467,11 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -8946,6 +9546,11 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9020,6 +9625,11 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9094,6 +9704,11 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9168,6 +9783,11 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9242,6 +9862,11 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9316,6 +9941,11 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9390,6 +10020,11 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9464,6 +10099,11 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9538,6 +10178,11 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9612,6 +10257,11 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9686,6 +10336,11 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9760,6 +10415,11 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9834,6 +10494,11 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9908,6 +10573,11 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -9982,6 +10652,11 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10056,6 +10731,11 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10130,6 +10810,11 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10204,6 +10889,11 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10278,6 +10968,11 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10352,6 +11047,11 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10426,6 +11126,11 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10500,6 +11205,11 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10574,6 +11284,11 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10648,6 +11363,11 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10722,6 +11442,11 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10796,6 +11521,11 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10870,6 +11600,11 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -10944,6 +11679,11 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11018,6 +11758,11 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11092,6 +11837,11 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11166,6 +11916,11 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11240,6 +11995,11 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11314,6 +12074,11 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11388,6 +12153,11 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11462,6 +12232,11 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11536,6 +12311,11 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11610,6 +12390,11 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11684,6 +12469,11 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11758,6 +12548,11 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11832,6 +12627,11 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11906,6 +12706,11 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -11980,6 +12785,11 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12054,6 +12864,11 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12128,6 +12943,11 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12202,6 +13022,11 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12276,6 +13101,11 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12350,6 +13180,11 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12424,6 +13259,11 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12498,6 +13338,11 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12572,6 +13417,11 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12646,6 +13496,11 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12720,6 +13575,11 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12794,6 +13654,11 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12868,6 +13733,11 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -12942,6 +13812,11 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13016,6 +13891,11 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13090,6 +13970,11 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13164,6 +14049,11 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13238,6 +14128,11 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13312,6 +14207,11 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13386,6 +14286,11 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13460,6 +14365,11 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13534,6 +14444,11 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13608,6 +14523,11 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13682,6 +14602,11 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13756,6 +14681,11 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13830,6 +14760,11 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13904,6 +14839,11 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -13978,6 +14918,11 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14052,6 +14997,11 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14126,6 +15076,11 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14200,6 +15155,11 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14274,6 +15234,11 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14348,6 +15313,11 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14422,6 +15392,11 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14496,6 +15471,11 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14570,6 +15550,11 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14644,6 +15629,11 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14718,6 +15708,11 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14792,6 +15787,11 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14866,6 +15866,11 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -14940,6 +15945,11 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15014,6 +16024,11 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15088,6 +16103,11 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15162,6 +16182,11 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15236,6 +16261,11 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15310,6 +16340,11 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15384,6 +16419,11 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15458,6 +16498,11 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15532,6 +16577,11 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15606,6 +16656,11 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15680,6 +16735,11 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15754,6 +16814,11 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15828,6 +16893,11 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15902,6 +16972,11 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -15976,6 +17051,11 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16050,6 +17130,11 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16124,6 +17209,11 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16198,6 +17288,11 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16272,6 +17367,11 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16346,6 +17446,11 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16420,6 +17525,11 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16494,6 +17604,11 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16568,6 +17683,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16642,6 +17762,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16716,6 +17841,11 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16790,6 +17920,11 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16864,6 +17999,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -16938,6 +18078,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17012,6 +18157,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17086,6 +18236,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17160,6 +18315,11 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17234,6 +18394,11 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17308,6 +18473,11 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17382,6 +18552,11 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17456,6 +18631,11 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17530,6 +18710,11 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17604,6 +18789,11 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17678,6 +18868,11 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17752,6 +18947,11 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17826,6 +19026,11 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17900,6 +19105,11 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -17974,6 +19184,11 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18048,6 +19263,11 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18122,6 +19342,11 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18196,6 +19421,11 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18270,6 +19500,11 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18344,6 +19579,11 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18418,6 +19658,11 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18492,6 +19737,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18566,6 +19816,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18640,6 +19895,11 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18714,6 +19974,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18788,6 +20053,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18862,6 +20132,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -18936,6 +20211,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19010,6 +20290,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19084,6 +20369,11 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19158,6 +20448,11 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19232,6 +20527,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19306,6 +20606,11 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -19380,6 +20685,11 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/member_idPubSubTypes.cxx b/test/dds-types-test/member_idPubSubTypes.cxx index 0aaa011e558..9e6db334afb 100644 --- a/test/dds-types-test/member_idPubSubTypes.cxx +++ b/test/dds-types-test/member_idPubSubTypes.cxx @@ -148,6 +148,25 @@ void FixIdPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixIdPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixId data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void FixHexIdPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixHexIdPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixHexId data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixHexIdPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void FixHashidDefaultPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixHashidDefaultPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixHashidDefault data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixHashidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void FixHashidPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixHashidPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixHashid data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixHashidPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void FixMixPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FixMixPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FixMix data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FixMixPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void AutoidDefaultPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AutoidDefaultPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AutoidDefault data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AutoidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void AutoidSequentialPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AutoidSequentialPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AutoidSequential data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void AutoidHashPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AutoidHashPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AutoidHash data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AutoidHashPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void DerivedAutoidDefaultPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DerivedAutoidDefaultPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DerivedAutoidDefault data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DerivedAutoidDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void DerivedEmptyAutoidSequentialPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DerivedEmptyAutoidSequentialPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DerivedEmptyAutoidSequential data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DerivedEmptyAutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void DerivedAutoidSequentialPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DerivedAutoidSequentialPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DerivedAutoidSequential data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DerivedAutoidSequentialPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void DerivedAutoidHashPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DerivedAutoidHashPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DerivedAutoidHash data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DerivedAutoidHashPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index 8a96f9ae770..dc997303c24 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -65,6 +65,11 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -139,6 +144,11 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -213,6 +223,11 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -287,6 +302,11 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -361,6 +381,11 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -435,6 +460,11 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -509,6 +539,11 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -583,6 +618,11 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -657,6 +697,11 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -731,6 +776,11 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -805,6 +855,11 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -879,6 +934,11 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/mutablePubSubTypes.cxx b/test/dds-types-test/mutablePubSubTypes.cxx index 33fe7ef8382..f1173f5481f 100644 --- a/test/dds-types-test/mutablePubSubTypes.cxx +++ b/test/dds-types-test/mutablePubSubTypes.cxx @@ -148,6 +148,25 @@ void MutableShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void MutableUShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableUShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableUShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableUShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void MutableLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void MutableULongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableULongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableULongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void MutableLongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableLongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableLongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableLongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void MutableULongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableULongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableULongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void MutableFloatStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableFloatStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableFloatStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableFloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void MutableDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void MutableLongDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableLongDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableLongDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableLongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void MutableBooleanStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableBooleanStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableBooleanStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableBooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void MutableOctetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableOctetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableOctetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableOctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void MutableCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void MutableWCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableWCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableWCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableWCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void MutableUnionStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableUnionStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableUnionStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableUnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void MutableEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void MutableEmptyInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableEmptyInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableEmptyInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableEmptyInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void MutableInheritanceStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableInheritanceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableInheritanceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableInheritanceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void MutableInheritanceEmptyStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableInheritanceEmptyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableInheritanceEmptyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableInheritanceEmptyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void MutableExtensibilityInheritancePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool MutableExtensibilityInheritancePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableExtensibilityInheritance data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool MutableExtensibilityInheritancePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index 953958bbed1..326cfb8a78e 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -66,6 +66,11 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/optionalPubSubTypes.cxx b/test/dds-types-test/optionalPubSubTypes.cxx index e74474e2804..0483c94da72 100644 --- a/test/dds-types-test/optionalPubSubTypes.cxx +++ b/test/dds-types-test/optionalPubSubTypes.cxx @@ -148,6 +148,25 @@ void short_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool short_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + short_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void ushort_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ushort_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ushort_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ushort_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void long_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool long_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + long_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool long_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void ulong_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulong_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulong_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void longlong_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longlong_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longlong_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longlong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void ulonglong_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulonglong_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulonglong_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulonglong_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void float_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool float_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + float_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool float_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void double_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool double_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + double_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool double_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void longdouble_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longdouble_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longdouble_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longdouble_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void boolean_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool boolean_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + boolean_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool boolean_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void octet_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool octet_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + octet_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool octet_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void char_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool char_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + char_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool char_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void wchar_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool wchar_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + wchar_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool wchar_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void short_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool short_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + short_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void short_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool short_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + short_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void short_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool short_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + short_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void ushort_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ushort_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ushort_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ushort_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void ushort_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ushort_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ushort_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ushort_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void ushort_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ushort_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ushort_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ushort_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void long_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool long_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + long_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool long_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void long_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool long_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + long_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool long_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void long_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool long_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + long_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool long_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void ulong_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulong_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulong_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void ulong_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulong_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulong_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void ulong_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulong_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulong_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void longlong_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longlong_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longlong_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longlong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void longlong_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longlong_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longlong_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longlong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void longlong_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longlong_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longlong_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longlong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4656,6 +5188,25 @@ void ulonglong_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulonglong_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulonglong_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulonglong_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4817,6 +5368,25 @@ void ulonglong_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulonglong_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulonglong_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulonglong_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4978,6 +5548,25 @@ void ulonglong_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ulonglong_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ulonglong_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ulonglong_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5139,6 +5728,25 @@ void float_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool float_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + float_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool float_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5300,6 +5908,25 @@ void float_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool float_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + float_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool float_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5461,6 +6088,25 @@ void float_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool float_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + float_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool float_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5622,6 +6268,25 @@ void double_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool double_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + double_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool double_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5783,6 +6448,25 @@ void double_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool double_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + double_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool double_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5944,6 +6628,25 @@ void double_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool double_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + double_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool double_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6105,6 +6808,25 @@ void longdouble_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longdouble_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longdouble_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longdouble_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6266,6 +6988,25 @@ void longdouble_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longdouble_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longdouble_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longdouble_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6427,6 +7168,25 @@ void longdouble_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool longdouble_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + longdouble_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool longdouble_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6588,6 +7348,25 @@ void boolean_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool boolean_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + boolean_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool boolean_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6749,6 +7528,25 @@ void boolean_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool boolean_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + boolean_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool boolean_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6910,6 +7708,25 @@ void boolean_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool boolean_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + boolean_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool boolean_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7071,6 +7888,25 @@ void octet_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool octet_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + octet_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool octet_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7232,6 +8068,25 @@ void octet_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool octet_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + octet_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool octet_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7393,6 +8248,25 @@ void octet_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool octet_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + octet_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool octet_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7554,6 +8428,25 @@ void char_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool char_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + char_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool char_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7715,6 +8608,25 @@ void char_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool char_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + char_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool char_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -7876,6 +8788,25 @@ void char_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool char_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + char_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool char_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8037,6 +8968,25 @@ void wchar_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool wchar_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + wchar_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool wchar_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8198,6 +9148,25 @@ void wchar_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool wchar_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + wchar_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool wchar_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8359,6 +9328,25 @@ void wchar_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool wchar_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + wchar_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool wchar_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8520,6 +9508,25 @@ void sequence_short_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool sequence_short_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sequence_short_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool sequence_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8681,6 +9688,25 @@ void sequence_short_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool sequence_short_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sequence_short_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool sequence_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -8842,6 +9868,25 @@ void sequence_short_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool sequence_short_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sequence_short_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool sequence_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9003,6 +10048,25 @@ void sequence_short_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool sequence_short_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + sequence_short_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool sequence_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9164,6 +10228,25 @@ void string_unbounded_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_unbounded_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_unbounded_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_unbounded_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9325,6 +10408,25 @@ void string_unbounded_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_unbounded_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_unbounded_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_unbounded_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9486,6 +10588,25 @@ void string_unbounded_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_unbounded_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_unbounded_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_unbounded_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9647,6 +10768,25 @@ void string_unbounded_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_unbounded_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_unbounded_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_unbounded_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9808,6 +10948,25 @@ void string_bounded_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_bounded_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_bounded_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_bounded_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -9969,6 +11128,25 @@ void string_bounded_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_bounded_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_bounded_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_bounded_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10130,6 +11308,25 @@ void string_bounded_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_bounded_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_bounded_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_bounded_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10291,6 +11488,25 @@ void string_bounded_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool string_bounded_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + string_bounded_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool string_bounded_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10452,6 +11668,25 @@ void map_short_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool map_short_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + map_short_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool map_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10613,6 +11848,25 @@ void map_short_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool map_short_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + map_short_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool map_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10774,6 +12028,25 @@ void map_short_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool map_short_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + map_short_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool map_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -10935,6 +12208,25 @@ void map_short_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool map_short_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + map_short_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool map_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11096,6 +12388,25 @@ void array_short_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool array_short_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + array_short_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool array_short_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11257,6 +12568,25 @@ void array_short_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool array_short_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + array_short_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool array_short_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11418,6 +12748,25 @@ void array_short_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool array_short_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + array_short_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool array_short_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11579,6 +12928,25 @@ void array_short_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool array_short_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + array_short_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool array_short_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11740,6 +13108,25 @@ void struct_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -11901,6 +13288,25 @@ void struct_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12062,6 +13468,25 @@ void struct_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12223,6 +13648,25 @@ void struct_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool struct_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + struct_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool struct_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12384,6 +13828,25 @@ void InnerStructOptionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool InnerStructOptionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + InnerStructOptional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool InnerStructOptionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12545,6 +14008,25 @@ void opt_struct_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool opt_struct_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + opt_struct_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool opt_struct_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12706,6 +14188,25 @@ void opt_struct_align_1_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool opt_struct_align_1_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + opt_struct_align_1_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool opt_struct_align_1_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -12867,6 +14368,25 @@ void opt_struct_align_2_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool opt_struct_align_2_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + opt_struct_align_2_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool opt_struct_align_2_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -13028,6 +14548,25 @@ void opt_struct_align_4_optionalPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool opt_struct_align_4_optionalPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + opt_struct_align_4_optional data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool opt_struct_align_4_optionalPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index fb2a8a402c2..6f359645f58 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -66,6 +66,11 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2138,6 +2278,11 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2212,6 +2357,11 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2286,6 +2436,11 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2360,6 +2515,11 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2434,6 +2594,11 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2508,6 +2673,11 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2582,6 +2752,11 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2656,6 +2831,11 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2730,6 +2910,11 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2804,6 +2989,11 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2878,6 +3068,11 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2952,6 +3147,11 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3026,6 +3226,11 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3100,6 +3305,11 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3174,6 +3384,11 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3248,6 +3463,11 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3322,6 +3542,11 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3396,6 +3621,11 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3470,6 +3700,11 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3544,6 +3779,11 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3618,6 +3858,11 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3692,6 +3937,11 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3766,6 +4016,11 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3840,6 +4095,11 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3914,6 +4174,11 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3988,6 +4253,11 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4062,6 +4332,11 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4136,6 +4411,11 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4210,6 +4490,11 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4284,6 +4569,11 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4358,6 +4648,11 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4432,6 +4727,11 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4506,6 +4806,11 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4580,6 +4885,11 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4654,6 +4964,11 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4728,6 +5043,11 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4802,6 +5122,11 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4876,6 +5201,11 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -4950,6 +5280,11 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5024,6 +5359,11 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5098,6 +5438,11 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5172,6 +5517,11 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5246,6 +5596,11 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5320,6 +5675,11 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5394,6 +5754,11 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5468,6 +5833,11 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5542,6 +5912,11 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5616,6 +5991,11 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5690,6 +6070,11 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5764,6 +6149,11 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5838,6 +6228,11 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5912,6 +6307,11 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -5986,6 +6386,11 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/primitivesPubSubTypes.cxx b/test/dds-types-test/primitivesPubSubTypes.cxx index 56575e68227..3afcc2b09f6 100644 --- a/test/dds-types-test/primitivesPubSubTypes.cxx +++ b/test/dds-types-test/primitivesPubSubTypes.cxx @@ -148,6 +148,25 @@ void ShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void UShortStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UShortStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UShortStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UShortStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void LongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void ULongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ULongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ULongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ULongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void LongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void ULongLongStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ULongLongStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ULongLongStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ULongLongStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void FloatStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool FloatStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FloatStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool FloatStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void DoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool DoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + DoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool DoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void LongDoubleStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LongDoubleStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LongDoubleStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LongDoubleStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void BooleanStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BooleanStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BooleanStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BooleanStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void OctetStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool OctetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + OctetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool OctetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void CharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool CharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + CharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool CharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void WCharStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool WCharStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + WCharStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool WCharStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void Int8StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Int8StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Int8Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Int8StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void Uint8StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Uint8StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Uint8Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Uint8StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void Int16StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Int16StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Int16Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Int16StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void Uint16StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Uint16StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Uint16Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Uint16StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void Int32StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Int32StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Int32Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Int32StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void Uint32StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Uint32StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Uint32Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Uint32StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void Int64StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Int64StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Int64Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Int64StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void Uint64StructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool Uint64StructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Uint64Struct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool Uint64StructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index a7d82007ba3..58a21756667 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -65,6 +65,11 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -139,6 +144,11 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -213,6 +223,11 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -287,6 +302,11 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -361,6 +381,11 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -435,6 +460,11 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -509,6 +539,11 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -583,6 +618,11 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -657,6 +697,11 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -731,6 +776,11 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -805,6 +855,11 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -879,6 +934,11 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -953,6 +1013,11 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1027,6 +1092,11 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1101,6 +1171,11 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1175,6 +1250,11 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1249,6 +1329,11 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1323,6 +1408,11 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1397,6 +1487,11 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1471,6 +1566,11 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1545,6 +1645,11 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/relative_path_includePubSubTypes.cxx b/test/dds-types-test/relative_path_includePubSubTypes.cxx index 8faddd78f8d..be0732f22b3 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.cxx +++ b/test/dds-types-test/relative_path_includePubSubTypes.cxx @@ -148,6 +148,25 @@ void RelativePathIncludeStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool RelativePathIncludeStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + RelativePathIncludeStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool RelativePathIncludeStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index cbe7cff7a8d..8450cfe7567 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -66,6 +66,11 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/sequencesPubSubTypes.cxx b/test/dds-types-test/sequencesPubSubTypes.cxx index 4c34a3495f4..d2b0816ebdf 100644 --- a/test/dds-types-test/sequencesPubSubTypes.cxx +++ b/test/dds-types-test/sequencesPubSubTypes.cxx @@ -148,6 +148,25 @@ void SequenceShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void SequenceUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void SequenceLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void SequenceULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void SequenceLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void SequenceULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void SequenceFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void SequenceDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void SequenceLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void SequenceBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void SequenceOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void SequenceCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void SequenceWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void SequenceStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void SequenceWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void SequenceStringBoundedPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceStringBoundedPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceStringBounded data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceStringBoundedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void SequenceWStringBoundedPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceWStringBoundedPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceWStringBounded data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceWStringBoundedPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void SequenceEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void SequenceBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void SequenceAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void SequenceShortArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceShortArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceShortArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void SequenceSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void SequenceMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void SequenceUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void SequenceStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void SequenceBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SequenceBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SequenceBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void BoundedSmallSequencesPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedSmallSequencesPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedSmallSequences data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedSmallSequencesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void BoundedBigSequencesPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool BoundedBigSequencesPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BoundedBigSequences data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool BoundedBigSequencesPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index aad1122005b..9af10371370 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -66,6 +66,11 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/stringsPubSubTypes.cxx b/test/dds-types-test/stringsPubSubTypes.cxx index a33a4f7eda5..abe68a06bd2 100644 --- a/test/dds-types-test/stringsPubSubTypes.cxx +++ b/test/dds-types-test/stringsPubSubTypes.cxx @@ -148,6 +148,25 @@ void StringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void WStringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool WStringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + WStringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool WStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void SmallStringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SmallStringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SmallStringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SmallStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void SmallWStringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool SmallWStringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SmallWStringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool SmallWStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void LargeStringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LargeStringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LargeStringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LargeStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void LargeWStringStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool LargeWStringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + LargeWStringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool LargeWStringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index 9cedcb69290..cb18f5cd235 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -65,6 +65,11 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -139,6 +144,11 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -213,6 +223,11 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -287,6 +302,11 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -361,6 +381,11 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -435,6 +460,11 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/structuresPubSubTypes.cxx b/test/dds-types-test/structuresPubSubTypes.cxx index 74714ed61e5..004ad7acf08 100644 --- a/test/dds-types-test/structuresPubSubTypes.cxx +++ b/test/dds-types-test/structuresPubSubTypes.cxx @@ -148,6 +148,25 @@ void StructShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void StructUnsignedShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructUnsignedShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructUnsignedShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructUnsignedShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void StructLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void StructUnsignedLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructUnsignedLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructUnsignedLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructUnsignedLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void StructLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void StructUnsignedLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructUnsignedLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructUnsignedLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructUnsignedLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void StructFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void StructDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void StructLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void StructBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void StructOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void StructChar8PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructChar8PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructChar8 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructChar8PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void StructChar16PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructChar16PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructChar16 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructChar16PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void StructStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void StructWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void StructBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void StructBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void StructEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void StructBitMaskPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructBitMaskPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructBitMask data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructBitMaskPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void StructAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void StructShortArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructShortArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructShortArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructShortArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void StructSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void StructMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void StructUnionPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructUnionPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructUnion data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructUnionPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void StructStructurePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructStructurePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructStructure data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructStructurePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void StructBitsetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructBitsetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructBitset data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructBitsetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void StructEmptyPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructEmptyPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructEmpty data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructEmptyPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void StructuresPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructuresPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + Structures data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructuresPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4657,6 +5189,25 @@ namespace testing_1 { delete(reinterpret_cast(data)); } + bool fooPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + foo data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool fooPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4821,6 +5372,25 @@ namespace testing_2 { delete(reinterpret_cast(data)); } + bool fooPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) + { + if (!is_compute_key_provided) + { + return false; + } + + foo data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool fooPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4984,6 +5554,25 @@ void barPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool barPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + bar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool barPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5145,6 +5734,25 @@ void root1PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool root1PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + root1 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool root1PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5306,6 +5914,25 @@ void root2PubSubType::delete_data( delete(reinterpret_cast(data)); } +bool root2PubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + root2 data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool root2PubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5467,6 +6094,25 @@ void rootPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool rootPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + root data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool rootPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index 101c51e8997..999416994b5 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -66,6 +66,11 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2140,6 +2280,11 @@ namespace testing_1 const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2217,6 +2362,11 @@ namespace testing_2 const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2292,6 +2442,11 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2366,6 +2521,11 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2440,6 +2600,11 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2514,6 +2679,11 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/dds-types-test/unionsPubSubTypes.cxx b/test/dds-types-test/unionsPubSubTypes.cxx index 54d69678a90..1d6605c46e5 100644 --- a/test/dds-types-test/unionsPubSubTypes.cxx +++ b/test/dds-types-test/unionsPubSubTypes.cxx @@ -148,6 +148,25 @@ void UnionShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -309,6 +328,25 @@ void UnionUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -470,6 +508,25 @@ void UnionLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -631,6 +688,25 @@ void UnionULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -792,6 +868,25 @@ void UnionLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -953,6 +1048,25 @@ void UnionULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1114,6 +1228,25 @@ void UnionFloatPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionFloatPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionFloat data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionFloatPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1275,6 +1408,25 @@ void UnionDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1436,6 +1588,25 @@ void UnionLongDoublePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionLongDoublePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionLongDouble data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionLongDoublePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1597,6 +1768,25 @@ void UnionBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1758,6 +1948,25 @@ void UnionOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -1919,6 +2128,25 @@ void UnionCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2080,6 +2308,25 @@ void UnionWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2241,6 +2488,25 @@ void UnionStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2402,6 +2668,25 @@ void UnionWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2563,6 +2848,25 @@ void UnionBoundedStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionBoundedStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionBoundedString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionBoundedStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2724,6 +3028,25 @@ void UnionBoundedWStringPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionBoundedWStringPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionBoundedWString data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionBoundedWStringPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -2885,6 +3208,25 @@ void UnionInnerEnumHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerEnumHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerEnumHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerEnumHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3046,6 +3388,25 @@ void UnionInnerBitMaskHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerBitMaskHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerBitMaskHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerBitMaskHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3207,6 +3568,25 @@ void UnionInnerAliasHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerAliasHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerAliasHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerAliasHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3368,6 +3748,25 @@ void UnionArrayPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionArrayPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionArray data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionArrayPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3529,6 +3928,25 @@ void UnionSequencePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionSequencePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionSequence data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionSequencePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3690,6 +4108,25 @@ void UnionMapPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionMapPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionMap data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionMapPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -3851,6 +4288,25 @@ void UnionInnerUnionHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerUnionHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerUnionHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerUnionHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4012,6 +4468,25 @@ void UnionInnerStructureHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerStructureHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerStructureHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerStructureHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4173,6 +4648,25 @@ void UnionInnerBitsetHelperPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionInnerBitsetHelperPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionInnerBitsetHelper data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionInnerBitsetHelperPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4334,6 +4828,25 @@ void UnionDiscriminatorShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4495,6 +5008,25 @@ void UnionDiscriminatorUShortPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorUShortPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorUShort data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorUShortPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4656,6 +5188,25 @@ void UnionDiscriminatorLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4817,6 +5368,25 @@ void UnionDiscriminatorULongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorULongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorULong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorULongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -4978,6 +5548,25 @@ void UnionDiscriminatorLongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorLongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorLongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorLongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5139,6 +5728,25 @@ void UnionDiscriminatorULongLongPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorULongLongPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorULongLong data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorULongLongPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5300,6 +5908,25 @@ void UnionDiscriminatorBooleanPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorBooleanPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorBoolean data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorBooleanPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5461,6 +6088,25 @@ void UnionDiscriminatorOctetPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorOctetPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorOctet data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorOctetPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5622,6 +6268,25 @@ void UnionDiscriminatorCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5783,6 +6448,25 @@ void UnionDiscriminatorWCharPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorWCharPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorWChar data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorWCharPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -5944,6 +6628,25 @@ void UnionDiscriminatorEnumPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorEnumPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorEnum data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorEnumPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6105,6 +6808,25 @@ void UnionDiscriminatorEnumLabelPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorEnumLabelPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorEnumLabel data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorEnumLabelPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6266,6 +6988,25 @@ void UnionDiscriminatorAliasPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionDiscriminatorAliasPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionDiscriminatorAlias data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionDiscriminatorAliasPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6427,6 +7168,25 @@ void UnionSeveralFieldsPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionSeveralFieldsPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionSeveralFields data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionSeveralFieldsPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -6588,6 +7348,25 @@ void UnionSeveralFieldsWithDefaultPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionSeveralFieldsWithDefault data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index 412c74b39f6..b1f11519326 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -66,6 +66,11 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -140,6 +145,11 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -214,6 +224,11 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -288,6 +303,11 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -362,6 +382,11 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -436,6 +461,11 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -510,6 +540,11 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -584,6 +619,11 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -658,6 +698,11 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -732,6 +777,11 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -806,6 +856,11 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -880,6 +935,11 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -954,6 +1014,11 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1028,6 +1093,11 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1102,6 +1172,11 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1176,6 +1251,11 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1250,6 +1330,11 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1324,6 +1409,11 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1398,6 +1488,11 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1472,6 +1567,11 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1546,6 +1646,11 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1620,6 +1725,11 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1694,6 +1804,11 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1768,6 +1883,11 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1842,6 +1962,11 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1916,6 +2041,11 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -1990,6 +2120,11 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2064,6 +2199,11 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2138,6 +2278,11 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2212,6 +2357,11 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2286,6 +2436,11 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2360,6 +2515,11 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2434,6 +2594,11 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2508,6 +2673,11 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2582,6 +2752,11 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2656,6 +2831,11 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2730,6 +2910,11 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2804,6 +2989,11 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2878,6 +3068,11 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -2952,6 +3147,11 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -3026,6 +3226,11 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index 2a09bbe8b04..f95b66e2d11 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -118,6 +118,16 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType void* create_data() override; void delete_data( void* data) override; + + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -210,6 +220,16 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* create_data() override; void delete_data( void* data) override; + + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index 9b2ff3abbef..86499fbdf2f 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -154,6 +154,15 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType void delete_data( void* data) override; + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -271,6 +280,15 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType void delete_data( void* data) override; + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index f042872cc36..9ba8bb1aa5e 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -102,6 +102,15 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType void* create_data() override; void delete_data( void* data) override; + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -166,6 +175,16 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* create_data() override; void delete_data( void* data) override; + + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool force_md5 = false) override + { + (void)force_md5; + return false; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx index d6a8d5443a9..0a919426c11 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx @@ -148,6 +148,25 @@ void AllocTestTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AllocTestTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AllocTestType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AllocTestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index 6cfc657a7ee..0416e1a5572 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -65,6 +65,11 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index c6dac70cbb2..89a38c57136 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -128,6 +128,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -197,6 +205,14 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index 9c03ebf099b..518fa524353 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -125,6 +125,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -214,6 +222,14 @@ class InstanceTopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* ihandle, @@ -270,6 +286,14 @@ class BoundedTopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -1312,6 +1336,14 @@ class LoanableTypeSupport : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index aa27f7b592c..feccf735246 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -76,6 +76,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, @@ -140,6 +148,14 @@ class LoanableTopicDataTypeMock : public TopicDataType return true; } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index c26e27caaea..c1e56121fc1 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -527,6 +527,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 428fb1dd0c6..0976dcafd86 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -38,6 +38,12 @@ class TestType : public TopicDataType void* data), (override)); + MOCK_METHOD(bool, compute_key, ( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::dds::InstanceHandle_t* ihandle, + bool), + (override)); + MOCK_METHOD(bool, compute_key, ( const void* const data, eprosima::fastdds::dds::InstanceHandle_t* ihandle, diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index f6fdbbd8231..96586e8fd10 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -3800,6 +3800,14 @@ class DataRepresentationTestsTypeSupport : public TopicDataType { } + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index b8bfdf776ea..19e96c99f4d 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -137,6 +137,14 @@ class FooBoundedTypeSupport : public TopicDataType delete p_type; } + bool compute_key( + fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::InstanceHandle_t* /*handle*/, + bool /*force_md5*/) override + { + return false; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*handle*/, diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index e6b8b42b700..03bc31cf448 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -134,6 +134,20 @@ class FooTypeSupport : public TopicDataType delete p_type; } + bool compute_key( + fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::InstanceHandle_t* handle, + bool force_md5) override + { + FooType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; + } + bool compute_key( const void* const data, fastdds::rtps::InstanceHandle_t* handle, diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp index 2a5b89d83da..e2dd81576cf 100644 --- a/test/unittest/dds/subscriber/SubscriberTests.cpp +++ b/test/unittest/dds/subscriber/SubscriberTests.cpp @@ -185,6 +185,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx index cd34a268186..ed563a03187 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx @@ -148,6 +148,25 @@ void StructTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool StructTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool StructTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -311,6 +330,25 @@ void ContentFilterTestTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ContentFilterTestTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ContentFilterTestType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ContentFilterTestTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index 3305b0a4afd..12e6b56fdfd 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -65,6 +65,11 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -141,6 +146,11 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index 991219263cf..1de63e9feb4 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -104,6 +104,14 @@ class TopicDataTypeMock : public TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx index ff7386f3a5c..4965e5656dc 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx @@ -148,6 +148,25 @@ void PrimitivesStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool PrimitivesStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PrimitivesStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool PrimitivesStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -318,6 +337,25 @@ void AllStructPubSubType::delete_data( delete(reinterpret_cast(data)); } +bool AllStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AllStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool AllStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, @@ -479,6 +517,25 @@ void ComprehensiveTypePubSubType::delete_data( delete(reinterpret_cast(data)); } +bool ComprehensiveTypePubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ComprehensiveType data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + bool ComprehensiveTypePubSubType::compute_key( const void* const data, InstanceHandle_t* handle, diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index c0014465950..7ba7d397265 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -65,6 +65,11 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -148,6 +153,11 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, @@ -222,6 +232,11 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp index 9914973e2cc..357e6b58e63 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp @@ -73,6 +73,14 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType { } + bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index 6f09f92d1a0..0e0accf3498 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -118,6 +118,14 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType { } + bool compute_key( + fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, + bool /*force_md5*/) override + { + return true; + } + bool compute_key( const void* const /*data*/, fastdds::rtps::InstanceHandle_t* /*ihandle*/, From fc4bd1bd57f9614d7fc67cbd894d72bdb20fe60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 15 Jul 2024 12:15:24 +0200 Subject: [PATCH 06/14] Refs #21349. Using new compute_key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp index 7f558a39f2f..a8326097bb1 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp @@ -146,12 +146,12 @@ DataReaderHistory::DataReaderHistory( if (type_ != nullptr) { EPROSIMA_LOG_INFO(SUBSCRIBER, "Getting Key of change with no Key transmitted"); - type_->deserialize(&a_change->serializedPayload, get_key_object_); bool is_key_protected = false; #if HAVE_SECURITY is_key_protected = mp_reader->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - return type_->compute_key(get_key_object_, &a_change->instanceHandle, is_key_protected); + return type_->compute_key(&a_change->serializedPayload, &a_change->instanceHandle, + is_key_protected); } EPROSIMA_LOG_WARNING(SUBSCRIBER, "NO KEY in topic: " << topic_name_ From 988e93c12a62ebd7ba02f2dff40beb08f2ac429a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 15 Jul 2024 12:44:11 +0200 Subject: [PATCH 07/14] Refs #21349. Regenerate code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- test/profiling/MemoryTestTypes.h | 2 +- .../dds/subscriber/FooBoundedTypeSupport.hpp | 2 +- .../gen/alias_structPubSubTypes.cxx | 121 ++--- .../gen/alias_structPubSubTypes.hpp | 38 +- .../gen/array_structPubSubTypes.cxx | 363 ++++++------- .../gen/array_structPubSubTypes.hpp | 106 ++-- .../gen/bitmask_structPubSubTypes.cxx | 121 ++--- .../gen/bitmask_structPubSubTypes.hpp | 38 +- .../gen/bitset_structPubSubTypes.cxx | 121 ++--- .../gen/bitset_structPubSubTypes.hpp | 38 +- .../gen/enum_structPubSubTypes.cxx | 121 ++--- .../gen/enum_structPubSubTypes.hpp | 38 +- .../gen/extensibility_structPubSubTypes.cxx | 500 ++++++++---------- .../gen/extensibility_structPubSubTypes.hpp | 140 ++--- .../key_struct/gen/key_structPubSubTypes.cxx | 242 ++++----- .../key_struct/gen/key_structPubSubTypes.hpp | 72 +-- .../map_struct/gen/map_structPubSubTypes.cxx | 242 ++++----- .../map_struct/gen/map_structPubSubTypes.hpp | 72 +-- .../gen/primitives_structPubSubTypes.cxx | 121 ++--- .../gen/primitives_structPubSubTypes.hpp | 38 +- .../gen/sequence_structPubSubTypes.cxx | 363 ++++++------- .../gen/sequence_structPubSubTypes.hpp | 106 ++-- .../gen/string_structPubSubTypes.cxx | 121 ++--- .../gen/string_structPubSubTypes.hpp | 38 +- .../gen/struct_structPubSubTypes.cxx | 500 ++++++++---------- .../gen/struct_structPubSubTypes.hpp | 140 ++--- .../gen/union_structPubSubTypes.cxx | 121 ++--- .../gen/union_structPubSubTypes.hpp | 38 +- 28 files changed, 1669 insertions(+), 2294 deletions(-) diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index 9ba8bb1aa5e..17c8555f938 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -177,7 +177,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index 19e96c99f4d..963b3593e76 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -138,7 +138,7 @@ class FooBoundedTypeSupport : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* /*payload*/, fastdds::rtps::InstanceHandle_t* /*handle*/, bool /*force_md5*/) override { diff --git a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx index 5957e1d7df1..5093f253fd8 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AliasStructPubSubType::AliasStructPubSubType() { - setName("AliasStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AliasStruct::getMaxCdrSerializedSize()); -#else - AliasStruct_max_cdr_typesize; -#endif + set_name("AliasStruct"); + uint32_t type_size = AliasStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AliasStruct_max_key_cdr_typesize > 16 ? AliasStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AliasStruct_max_key_cdr_typesize > 16 ? AliasStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AliasStructPubSubType::~AliasStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool AliasStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool AliasStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool AliasStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool AliasStructPubSubType::deserialize( return true; } -std::function AliasStructPubSubType::getSerializedSizeProvider( +uint32_t AliasStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* AliasStructPubSubType::createData() +void* AliasStructPubSubType::create_data() { return reinterpret_cast(new AliasStruct()); } -void AliasStructPubSubType::deleteData( +void AliasStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AliasStructPubSubType::getKey( +bool AliasStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AliasStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool AliasStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool AliasStructPubSubType::getKey( const AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AliasStruct_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 || AliasStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp index efef4820a40..f5f946356d1 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "alias_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated alias_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER typedef uint32_t MyLong; typedef int16_t MyShort; @@ -57,13 +57,6 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AliasStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -73,24 +66,23 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -105,10 +97,6 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -129,8 +117,8 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx index 21aa3f8ab17..8f6ee392146 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; NestedArrayElementPubSubType::NestedArrayElementPubSubType() { - setName("NestedArrayElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(NestedArrayElement::getMaxCdrSerializedSize()); -#else - NestedArrayElement_max_cdr_typesize; -#endif + set_name("NestedArrayElement"); + uint32_t type_size = NestedArrayElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = NestedArrayElement_max_key_cdr_typesize > 16 ? NestedArrayElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = NestedArrayElement_max_key_cdr_typesize > 16 ? NestedArrayElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } NestedArrayElementPubSubType::~NestedArrayElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool NestedArrayElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool NestedArrayElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool NestedArrayElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool NestedArrayElementPubSubType::deserialize( return true; } -std::function NestedArrayElementPubSubType::getSerializedSizeProvider( +uint32_t NestedArrayElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* NestedArrayElementPubSubType::createData() +void* NestedArrayElementPubSubType::create_data() { return reinterpret_cast(new NestedArrayElement()); } -void NestedArrayElementPubSubType::deleteData( +void NestedArrayElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool NestedArrayElementPubSubType::getKey( +bool NestedArrayElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + NestedArrayElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool NestedArrayElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool NestedArrayElementPubSubType::getKey( const NestedArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), NestedArrayElement_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 || NestedArrayElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void NestedArrayElementPubSubType::register_type_object_representation() ComplexArrayElementPubSubType::ComplexArrayElementPubSubType() { - setName("ComplexArrayElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ComplexArrayElement::getMaxCdrSerializedSize()); -#else - ComplexArrayElement_max_cdr_typesize; -#endif + set_name("ComplexArrayElement"); + uint32_t type_size = ComplexArrayElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ComplexArrayElement_max_key_cdr_typesize > 16 ? ComplexArrayElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ComplexArrayElement_max_key_cdr_typesize > 16 ? ComplexArrayElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ComplexArrayElementPubSubType::~ComplexArrayElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool ComplexArrayElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool ComplexArrayElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool ComplexArrayElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool ComplexArrayElementPubSubType::deserialize( return true; } -std::function ComplexArrayElementPubSubType::getSerializedSizeProvider( +uint32_t ComplexArrayElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ComplexArrayElementPubSubType::createData() +void* ComplexArrayElementPubSubType::create_data() { return reinterpret_cast(new ComplexArrayElement()); } -void ComplexArrayElementPubSubType::deleteData( +void ComplexArrayElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ComplexArrayElementPubSubType::getKey( +bool ComplexArrayElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ComplexArrayElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ComplexArrayElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool ComplexArrayElementPubSubType::getKey( const ComplexArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ComplexArrayElement_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 || ComplexArrayElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +393,21 @@ void ComplexArrayElementPubSubType::register_type_object_representation() ArrayStructPubSubType::ArrayStructPubSubType() { - setName("ArrayStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ArrayStruct::getMaxCdrSerializedSize()); -#else - ArrayStruct_max_cdr_typesize; -#endif + set_name("ArrayStruct"); + uint32_t type_size = ArrayStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ArrayStruct_max_key_cdr_typesize > 16 ? ArrayStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ArrayStruct_max_key_cdr_typesize > 16 ? ArrayStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ArrayStructPubSubType::~ArrayStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +425,10 @@ bool ArrayStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +443,7 @@ bool ArrayStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +460,7 @@ bool ArrayStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +477,62 @@ bool ArrayStructPubSubType::deserialize( return true; } -std::function ArrayStructPubSubType::getSerializedSizeProvider( +uint32_t ArrayStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ArrayStructPubSubType::createData() +void* ArrayStructPubSubType::create_data() { return reinterpret_cast(new ArrayStruct()); } -void ArrayStructPubSubType::deleteData( +void ArrayStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ArrayStructPubSubType::getKey( +bool ArrayStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ArrayStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ArrayStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +540,27 @@ bool ArrayStructPubSubType::getKey( const ArrayStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ArrayStruct_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 || ArrayStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp index 0d0672b8fc1..9397608fc4b 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "array_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated array_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport ~NestedArrayElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,13 +131,6 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~ComplexArrayElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,24 +140,23 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,10 +171,6 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -215,8 +191,8 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -234,13 +210,6 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ArrayStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,24 +219,23 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -282,10 +250,6 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -306,8 +270,8 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx index a42af45f42c..32167de6781 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; BitmaskStructPubSubType::BitmaskStructPubSubType() { - setName("BitmaskStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BitmaskStruct::getMaxCdrSerializedSize()); -#else - BitmaskStruct_max_cdr_typesize; -#endif + set_name("BitmaskStruct"); + uint32_t type_size = BitmaskStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BitmaskStruct_max_key_cdr_typesize > 16 ? BitmaskStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BitmaskStruct_max_key_cdr_typesize > 16 ? BitmaskStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BitmaskStructPubSubType::~BitmaskStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool BitmaskStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool BitmaskStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool BitmaskStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool BitmaskStructPubSubType::deserialize( return true; } -std::function BitmaskStructPubSubType::getSerializedSizeProvider( +uint32_t BitmaskStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BitmaskStructPubSubType::createData() +void* BitmaskStructPubSubType::create_data() { return reinterpret_cast(new BitmaskStruct()); } -void BitmaskStructPubSubType::deleteData( +void BitmaskStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BitmaskStructPubSubType::getKey( +bool BitmaskStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BitmaskStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool BitmaskStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool BitmaskStructPubSubType::getKey( const BitmaskStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BitmaskStruct_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 || BitmaskStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp index df42d2f96aa..33c1e246a47 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "bitmask_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated bitmask_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BitmaskStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx index d327fd7adb3..6d2156195ce 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; BitsetStructPubSubType::BitsetStructPubSubType() { - setName("BitsetStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(BitsetStruct::getMaxCdrSerializedSize()); -#else - BitsetStruct_max_cdr_typesize; -#endif + set_name("BitsetStruct"); + uint32_t type_size = BitsetStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = BitsetStruct_max_key_cdr_typesize > 16 ? BitsetStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = BitsetStruct_max_key_cdr_typesize > 16 ? BitsetStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } BitsetStructPubSubType::~BitsetStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool BitsetStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool BitsetStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool BitsetStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool BitsetStructPubSubType::deserialize( return true; } -std::function BitsetStructPubSubType::getSerializedSizeProvider( +uint32_t BitsetStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* BitsetStructPubSubType::createData() +void* BitsetStructPubSubType::create_data() { return reinterpret_cast(new BitsetStruct()); } -void BitsetStructPubSubType::deleteData( +void BitsetStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool BitsetStructPubSubType::getKey( +bool BitsetStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + BitsetStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool BitsetStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool BitsetStructPubSubType::getKey( const BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), BitsetStruct_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 || BitsetStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp index 299306c4338..3aa7ddfdecc 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "bitset_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated bitset_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~BitsetStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx index e6d63cec8b4..a8ca8ab7bce 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; EnumStructPubSubType::EnumStructPubSubType() { - setName("EnumStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(EnumStruct::getMaxCdrSerializedSize()); -#else - EnumStruct_max_cdr_typesize; -#endif + set_name("EnumStruct"); + uint32_t type_size = EnumStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = EnumStruct_max_key_cdr_typesize > 16 ? EnumStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = EnumStruct_max_key_cdr_typesize > 16 ? EnumStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } EnumStructPubSubType::~EnumStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool EnumStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool EnumStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool EnumStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool EnumStructPubSubType::deserialize( return true; } -std::function EnumStructPubSubType::getSerializedSizeProvider( +uint32_t EnumStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* EnumStructPubSubType::createData() +void* EnumStructPubSubType::create_data() { return reinterpret_cast(new EnumStruct()); } -void EnumStructPubSubType::deleteData( +void EnumStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool EnumStructPubSubType::getKey( +bool EnumStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + EnumStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool EnumStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool EnumStructPubSubType::getKey( const EnumStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), EnumStruct_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 || EnumStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp index 4a0e3122b01..66bd6bea195 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "enum_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated enum_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~EnumStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx index 87070348864..250dc010571 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FinalStructPubSubType::FinalStructPubSubType() { - setName("FinalStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(FinalStruct::getMaxCdrSerializedSize()); -#else - FinalStruct_max_cdr_typesize; -#endif + set_name("FinalStruct"); + uint32_t type_size = FinalStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = FinalStruct_max_key_cdr_typesize > 16 ? FinalStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = FinalStruct_max_key_cdr_typesize > 16 ? FinalStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } FinalStructPubSubType::~FinalStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool FinalStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool FinalStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool FinalStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool FinalStructPubSubType::deserialize( return true; } -std::function FinalStructPubSubType::getSerializedSizeProvider( +uint32_t FinalStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* FinalStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* FinalStructPubSubType::create_data() { return reinterpret_cast(new FinalStruct()); } -void FinalStructPubSubType::deleteData( +void FinalStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FinalStructPubSubType::getKey( +bool FinalStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + FinalStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool FinalStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool FinalStructPubSubType::getKey( const FinalStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), FinalStruct_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 || FinalStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void FinalStructPubSubType::register_type_object_representation() MutableStructPubSubType::MutableStructPubSubType() { - setName("MutableStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MutableStruct::getMaxCdrSerializedSize()); -#else - MutableStruct_max_cdr_typesize; -#endif + set_name("MutableStruct"); + uint32_t type_size = MutableStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MutableStruct_max_key_cdr_typesize > 16 ? MutableStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MutableStruct_max_key_cdr_typesize > 16 ? MutableStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MutableStructPubSubType::~MutableStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool MutableStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool MutableStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool MutableStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool MutableStructPubSubType::deserialize( return true; } -std::function MutableStructPubSubType::getSerializedSizeProvider( +uint32_t MutableStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* MutableStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* MutableStructPubSubType::create_data() { return reinterpret_cast(new MutableStruct()); } -void MutableStructPubSubType::deleteData( +void MutableStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MutableStructPubSubType::getKey( +bool MutableStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MutableStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MutableStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool MutableStructPubSubType::getKey( const MutableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MutableStruct_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 || MutableStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +393,21 @@ void MutableStructPubSubType::register_type_object_representation() AppendableStructPubSubType::AppendableStructPubSubType() { - setName("AppendableStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(AppendableStruct::getMaxCdrSerializedSize()); -#else - AppendableStruct_max_cdr_typesize; -#endif + set_name("AppendableStruct"); + uint32_t type_size = AppendableStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = AppendableStruct_max_key_cdr_typesize > 16 ? AppendableStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = AppendableStruct_max_key_cdr_typesize > 16 ? AppendableStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } AppendableStructPubSubType::~AppendableStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +425,10 @@ bool AppendableStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +443,7 @@ bool AppendableStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +460,7 @@ bool AppendableStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +477,62 @@ bool AppendableStructPubSubType::deserialize( return true; } -std::function AppendableStructPubSubType::getSerializedSizeProvider( +uint32_t AppendableStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* AppendableStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* AppendableStructPubSubType::create_data() { return reinterpret_cast(new AppendableStruct()); } -void AppendableStructPubSubType::deleteData( +void AppendableStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool AppendableStructPubSubType::getKey( +bool AppendableStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + AppendableStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool AppendableStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +540,27 @@ bool AppendableStructPubSubType::getKey( const AppendableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), AppendableStruct_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 || AppendableStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +573,21 @@ void AppendableStructPubSubType::register_type_object_representation() ExtensibilityStructPubSubType::ExtensibilityStructPubSubType() { - setName("ExtensibilityStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ExtensibilityStruct::getMaxCdrSerializedSize()); -#else - ExtensibilityStruct_max_cdr_typesize; -#endif + set_name("ExtensibilityStruct"); + uint32_t type_size = ExtensibilityStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ExtensibilityStruct_max_key_cdr_typesize > 16 ? ExtensibilityStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ExtensibilityStruct_max_key_cdr_typesize > 16 ? ExtensibilityStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ExtensibilityStructPubSubType::~ExtensibilityStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +605,10 @@ bool ExtensibilityStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +623,7 @@ bool ExtensibilityStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +640,7 @@ bool ExtensibilityStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +657,62 @@ bool ExtensibilityStructPubSubType::deserialize( return true; } -std::function ExtensibilityStructPubSubType::getSerializedSizeProvider( +uint32_t ExtensibilityStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ExtensibilityStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ExtensibilityStructPubSubType::create_data() { return reinterpret_cast(new ExtensibilityStruct()); } -void ExtensibilityStructPubSubType::deleteData( +void ExtensibilityStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ExtensibilityStructPubSubType::getKey( +bool ExtensibilityStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ExtensibilityStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ExtensibilityStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +720,27 @@ bool ExtensibilityStructPubSubType::getKey( const ExtensibilityStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ExtensibilityStruct_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 || ExtensibilityStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp index 28ad65cb910..0acf7fdb93c 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "extensibility_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated extensibility_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER #ifndef SWIG @@ -85,13 +85,6 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~FinalStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -101,24 +94,23 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -133,10 +125,6 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return is_plain_xcdrv1_impl(); - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -163,8 +151,8 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; private: @@ -198,13 +186,6 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MutableStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -214,24 +195,23 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -246,10 +226,6 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -270,8 +246,8 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -289,13 +265,6 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~AppendableStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -305,24 +274,23 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -337,10 +305,6 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -361,8 +325,8 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -380,13 +344,6 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~ExtensibilityStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -396,24 +353,23 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -428,10 +384,6 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -452,8 +404,8 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx index 4a48941b222..6250ac91171 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ImportantStructPubSubType::ImportantStructPubSubType() { - setName("ImportantStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ImportantStruct::getMaxCdrSerializedSize()); -#else - ImportantStruct_max_cdr_typesize; -#endif + set_name("ImportantStruct"); + uint32_t type_size = ImportantStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = ImportantStruct_max_key_cdr_typesize > 16 ? ImportantStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = ImportantStruct_max_key_cdr_typesize > 16 ? ImportantStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ImportantStructPubSubType::~ImportantStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool ImportantStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool ImportantStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool ImportantStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool ImportantStructPubSubType::deserialize( return true; } -std::function ImportantStructPubSubType::getSerializedSizeProvider( +uint32_t ImportantStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ImportantStructPubSubType::createData() +void* ImportantStructPubSubType::create_data() { return reinterpret_cast(new ImportantStruct()); } -void ImportantStructPubSubType::deleteData( +void ImportantStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ImportantStructPubSubType::getKey( +bool ImportantStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ImportantStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ImportantStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool ImportantStructPubSubType::getKey( const ImportantStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ImportantStruct_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 || ImportantStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void ImportantStructPubSubType::register_type_object_representation() KeyStructPubSubType::KeyStructPubSubType() { - setName("KeyStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(KeyStruct::getMaxCdrSerializedSize()); -#else - KeyStruct_max_cdr_typesize; -#endif + set_name("KeyStruct"); + uint32_t type_size = KeyStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = true; - uint32_t keyLength = KeyStruct_max_key_cdr_typesize > 16 ? KeyStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = true; + uint32_t key_length = KeyStruct_max_key_cdr_typesize > 16 ? KeyStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } KeyStructPubSubType::~KeyStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool KeyStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool KeyStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool KeyStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool KeyStructPubSubType::deserialize( return true; } -std::function KeyStructPubSubType::getSerializedSizeProvider( +uint32_t KeyStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* KeyStructPubSubType::createData() +void* KeyStructPubSubType::create_data() { return reinterpret_cast(new KeyStruct()); } -void KeyStructPubSubType::deleteData( +void KeyStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool KeyStructPubSubType::getKey( +bool KeyStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + KeyStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool KeyStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool KeyStructPubSubType::getKey( const KeyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), KeyStruct_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 || KeyStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp index bb3d4678554..f25e64d92e3 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "key_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated key_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ImportantStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,13 +131,6 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~KeyStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,24 +140,23 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,10 +171,6 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -215,8 +191,8 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx index 8c30463bdcc..6349d35495e 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ValueStructPubSubType::ValueStructPubSubType() { - setName("ValueStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ValueStruct::getMaxCdrSerializedSize()); -#else - ValueStruct_max_cdr_typesize; -#endif + set_name("ValueStruct"); + uint32_t type_size = ValueStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ValueStruct_max_key_cdr_typesize > 16 ? ValueStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ValueStruct_max_key_cdr_typesize > 16 ? ValueStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ValueStructPubSubType::~ValueStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool ValueStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool ValueStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool ValueStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool ValueStructPubSubType::deserialize( return true; } -std::function ValueStructPubSubType::getSerializedSizeProvider( +uint32_t ValueStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ValueStructPubSubType::createData() +void* ValueStructPubSubType::create_data() { return reinterpret_cast(new ValueStruct()); } -void ValueStructPubSubType::deleteData( +void ValueStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ValueStructPubSubType::getKey( +bool ValueStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ValueStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ValueStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool ValueStructPubSubType::getKey( const ValueStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ValueStruct_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 || ValueStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void ValueStructPubSubType::register_type_object_representation() MapStructPubSubType::MapStructPubSubType() { - setName("MapStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(MapStruct::getMaxCdrSerializedSize()); -#else - MapStruct_max_cdr_typesize; -#endif + set_name("MapStruct"); + uint32_t type_size = MapStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = MapStruct_max_key_cdr_typesize > 16 ? MapStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = MapStruct_max_key_cdr_typesize > 16 ? MapStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } MapStructPubSubType::~MapStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool MapStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool MapStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool MapStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool MapStructPubSubType::deserialize( return true; } -std::function MapStructPubSubType::getSerializedSizeProvider( +uint32_t MapStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* MapStructPubSubType::createData() +void* MapStructPubSubType::create_data() { return reinterpret_cast(new MapStruct()); } -void MapStructPubSubType::deleteData( +void MapStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool MapStructPubSubType::getKey( +bool MapStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + MapStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool MapStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool MapStructPubSubType::getKey( const MapStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), MapStruct_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 || MapStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp index 6cffc72f9e0..9f83a37ec08 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "map_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated map_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ValueStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,13 +131,6 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~MapStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,24 +140,23 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,10 +171,6 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -215,8 +191,8 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx index 3434ba975ca..0f5af696c22 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; PrimitivesStructPubSubType::PrimitivesStructPubSubType() { - setName("PrimitivesStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(PrimitivesStruct::getMaxCdrSerializedSize()); -#else - PrimitivesStruct_max_cdr_typesize; -#endif + set_name("PrimitivesStruct"); + uint32_t type_size = PrimitivesStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = PrimitivesStruct_max_key_cdr_typesize > 16 ? PrimitivesStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = PrimitivesStruct_max_key_cdr_typesize > 16 ? PrimitivesStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } PrimitivesStructPubSubType::~PrimitivesStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool PrimitivesStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool PrimitivesStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool PrimitivesStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool PrimitivesStructPubSubType::deserialize( return true; } -std::function PrimitivesStructPubSubType::getSerializedSizeProvider( +uint32_t PrimitivesStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* PrimitivesStructPubSubType::createData() +void* PrimitivesStructPubSubType::create_data() { return reinterpret_cast(new PrimitivesStruct()); } -void PrimitivesStructPubSubType::deleteData( +void PrimitivesStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool PrimitivesStructPubSubType::getKey( +bool PrimitivesStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + PrimitivesStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool PrimitivesStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool PrimitivesStructPubSubType::getKey( const PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), PrimitivesStruct_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 || PrimitivesStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp index afcc3758609..dc813132db2 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "primitives_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated primitives_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~PrimitivesStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx index 406a1041ea5..030fb441170 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; NestedSequenceElementPubSubType::NestedSequenceElementPubSubType() { - setName("NestedSequenceElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(NestedSequenceElement::getMaxCdrSerializedSize()); -#else - NestedSequenceElement_max_cdr_typesize; -#endif + set_name("NestedSequenceElement"); + uint32_t type_size = NestedSequenceElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = NestedSequenceElement_max_key_cdr_typesize > 16 ? NestedSequenceElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = NestedSequenceElement_max_key_cdr_typesize > 16 ? NestedSequenceElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } NestedSequenceElementPubSubType::~NestedSequenceElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool NestedSequenceElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool NestedSequenceElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool NestedSequenceElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool NestedSequenceElementPubSubType::deserialize( return true; } -std::function NestedSequenceElementPubSubType::getSerializedSizeProvider( +uint32_t NestedSequenceElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* NestedSequenceElementPubSubType::createData() +void* NestedSequenceElementPubSubType::create_data() { return reinterpret_cast(new NestedSequenceElement()); } -void NestedSequenceElementPubSubType::deleteData( +void NestedSequenceElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool NestedSequenceElementPubSubType::getKey( +bool NestedSequenceElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + NestedSequenceElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool NestedSequenceElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool NestedSequenceElementPubSubType::getKey( const NestedSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), NestedSequenceElement_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 || NestedSequenceElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void NestedSequenceElementPubSubType::register_type_object_representation() ComplexSequenceElementPubSubType::ComplexSequenceElementPubSubType() { - setName("ComplexSequenceElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ComplexSequenceElement::getMaxCdrSerializedSize()); -#else - ComplexSequenceElement_max_cdr_typesize; -#endif + set_name("ComplexSequenceElement"); + uint32_t type_size = ComplexSequenceElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ComplexSequenceElement_max_key_cdr_typesize > 16 ? ComplexSequenceElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ComplexSequenceElement_max_key_cdr_typesize > 16 ? ComplexSequenceElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ComplexSequenceElementPubSubType::~ComplexSequenceElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool ComplexSequenceElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool ComplexSequenceElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool ComplexSequenceElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool ComplexSequenceElementPubSubType::deserialize( return true; } -std::function ComplexSequenceElementPubSubType::getSerializedSizeProvider( +uint32_t ComplexSequenceElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* ComplexSequenceElementPubSubType::createData() +void* ComplexSequenceElementPubSubType::create_data() { return reinterpret_cast(new ComplexSequenceElement()); } -void ComplexSequenceElementPubSubType::deleteData( +void ComplexSequenceElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ComplexSequenceElementPubSubType::getKey( +bool ComplexSequenceElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ComplexSequenceElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ComplexSequenceElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool ComplexSequenceElementPubSubType::getKey( const ComplexSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ComplexSequenceElement_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 || ComplexSequenceElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +393,21 @@ void ComplexSequenceElementPubSubType::register_type_object_representation() SequenceStructPubSubType::SequenceStructPubSubType() { - setName("SequenceStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(SequenceStruct::getMaxCdrSerializedSize()); -#else - SequenceStruct_max_cdr_typesize; -#endif + set_name("SequenceStruct"); + uint32_t type_size = SequenceStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = SequenceStruct_max_key_cdr_typesize > 16 ? SequenceStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = SequenceStruct_max_key_cdr_typesize > 16 ? SequenceStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } SequenceStructPubSubType::~SequenceStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +425,10 @@ bool SequenceStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +443,7 @@ bool SequenceStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +460,7 @@ bool SequenceStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +477,62 @@ bool SequenceStructPubSubType::deserialize( return true; } -std::function SequenceStructPubSubType::getSerializedSizeProvider( +uint32_t SequenceStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* SequenceStructPubSubType::createData() +void* SequenceStructPubSubType::create_data() { return reinterpret_cast(new SequenceStruct()); } -void SequenceStructPubSubType::deleteData( +void SequenceStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool SequenceStructPubSubType::getKey( +bool SequenceStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + SequenceStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool SequenceStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +540,27 @@ bool SequenceStructPubSubType::getKey( const SequenceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), SequenceStruct_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 || SequenceStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp index d0c2498530d..305c6dedcea 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "sequence_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated sequence_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport ~NestedSequenceElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,13 +131,6 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport ~ComplexSequenceElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,24 +140,23 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,10 +171,6 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -215,8 +191,8 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -234,13 +210,6 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~SequenceStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,24 +219,23 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -282,10 +250,6 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -306,8 +270,8 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx index 68f1132a3dc..bd0f053744c 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StringStructPubSubType::StringStructPubSubType() { - setName("StringStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StringStruct::getMaxCdrSerializedSize()); -#else - StringStruct_max_cdr_typesize; -#endif + set_name("StringStruct"); + uint32_t type_size = StringStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StringStruct_max_key_cdr_typesize > 16 ? StringStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StringStruct_max_key_cdr_typesize > 16 ? StringStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StringStructPubSubType::~StringStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool StringStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool StringStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool StringStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool StringStructPubSubType::deserialize( return true; } -std::function StringStructPubSubType::getSerializedSizeProvider( +uint32_t StringStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* StringStructPubSubType::createData() +void* StringStructPubSubType::create_data() { return reinterpret_cast(new StringStruct()); } -void StringStructPubSubType::deleteData( +void StringStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StringStructPubSubType::getKey( +bool StringStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StringStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool StringStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool StringStructPubSubType::getKey( const StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StringStruct_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 || StringStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp index e8e375b8b10..893879e22f0 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "string_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated string_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StringStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx index 90e507519ec..798a5158000 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; GrandparentStructPubSubType::GrandparentStructPubSubType() { - setName("GrandparentStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(GrandparentStruct::getMaxCdrSerializedSize()); -#else - GrandparentStruct_max_cdr_typesize; -#endif + set_name("GrandparentStruct"); + uint32_t type_size = GrandparentStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = GrandparentStruct_max_key_cdr_typesize > 16 ? GrandparentStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = GrandparentStruct_max_key_cdr_typesize > 16 ? GrandparentStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } GrandparentStructPubSubType::~GrandparentStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool GrandparentStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool GrandparentStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool GrandparentStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool GrandparentStructPubSubType::deserialize( return true; } -std::function GrandparentStructPubSubType::getSerializedSizeProvider( +uint32_t GrandparentStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* GrandparentStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* GrandparentStructPubSubType::create_data() { return reinterpret_cast(new GrandparentStruct()); } -void GrandparentStructPubSubType::deleteData( +void GrandparentStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool GrandparentStructPubSubType::getKey( +bool GrandparentStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + GrandparentStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool GrandparentStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool GrandparentStructPubSubType::getKey( const GrandparentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), GrandparentStruct_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 || GrandparentStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -226,26 +213,21 @@ void GrandparentStructPubSubType::register_type_object_representation() ParentStructPubSubType::ParentStructPubSubType() { - setName("ParentStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(ParentStruct::getMaxCdrSerializedSize()); -#else - ParentStruct_max_cdr_typesize; -#endif + set_name("ParentStruct"); + uint32_t type_size = ParentStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = ParentStruct_max_key_cdr_typesize > 16 ? ParentStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = ParentStruct_max_key_cdr_typesize > 16 ? ParentStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } ParentStructPubSubType::~ParentStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -263,12 +245,10 @@ bool ParentStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -283,11 +263,7 @@ bool ParentStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -304,11 +280,7 @@ bool ParentStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -325,52 +297,62 @@ bool ParentStructPubSubType::deserialize( return true; } -std::function ParentStructPubSubType::getSerializedSizeProvider( +uint32_t ParentStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* ParentStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* ParentStructPubSubType::create_data() { return reinterpret_cast(new ParentStruct()); } -void ParentStructPubSubType::deleteData( +void ParentStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ParentStructPubSubType::getKey( +bool ParentStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + ParentStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool ParentStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -378,35 +360,27 @@ bool ParentStructPubSubType::getKey( const ParentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), ParentStruct_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 || ParentStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -419,26 +393,21 @@ void ParentStructPubSubType::register_type_object_representation() NestedStructElementPubSubType::NestedStructElementPubSubType() { - setName("NestedStructElement"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(NestedStructElement::getMaxCdrSerializedSize()); -#else - NestedStructElement_max_cdr_typesize; -#endif + set_name("NestedStructElement"); + uint32_t type_size = NestedStructElement_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = NestedStructElement_max_key_cdr_typesize > 16 ? NestedStructElement_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = NestedStructElement_max_key_cdr_typesize > 16 ? NestedStructElement_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } NestedStructElementPubSubType::~NestedStructElementPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -456,12 +425,10 @@ bool NestedStructElementPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -476,11 +443,7 @@ bool NestedStructElementPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -497,11 +460,7 @@ bool NestedStructElementPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -518,52 +477,62 @@ bool NestedStructElementPubSubType::deserialize( return true; } -std::function NestedStructElementPubSubType::getSerializedSizeProvider( +uint32_t NestedStructElementPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* NestedStructElementPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* NestedStructElementPubSubType::create_data() { return reinterpret_cast(new NestedStructElement()); } -void NestedStructElementPubSubType::deleteData( +void NestedStructElementPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool NestedStructElementPubSubType::getKey( +bool NestedStructElementPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + NestedStructElement data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool NestedStructElementPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -571,35 +540,27 @@ bool NestedStructElementPubSubType::getKey( const NestedStructElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), NestedStructElement_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 || NestedStructElement_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; @@ -612,26 +573,21 @@ void NestedStructElementPubSubType::register_type_object_representation() StructStructPubSubType::StructStructPubSubType() { - setName("StructStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(StructStruct::getMaxCdrSerializedSize()); -#else - StructStruct_max_cdr_typesize; -#endif + set_name("StructStruct"); + uint32_t type_size = StructStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = StructStruct_max_key_cdr_typesize > 16 ? StructStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = StructStruct_max_key_cdr_typesize > 16 ? StructStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } StructStructPubSubType::~StructStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -649,12 +605,10 @@ bool StructStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -669,11 +623,7 @@ bool StructStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -690,11 +640,7 @@ bool StructStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -711,52 +657,62 @@ bool StructStructPubSubType::deserialize( return true; } -std::function StructStructPubSubType::getSerializedSizeProvider( +uint32_t StructStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; -} - -void* StructStructPubSubType::createData() + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } +} + +void* StructStructPubSubType::create_data() { return reinterpret_cast(new StructStruct()); } -void StructStructPubSubType::deleteData( +void StructStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool StructStructPubSubType::getKey( +bool StructStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + StructStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool StructStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -764,35 +720,27 @@ bool StructStructPubSubType::getKey( const StructStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), StructStruct_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 || StructStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp index 5a87fd6aa30..f36283e79e8 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "struct_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated struct_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~GrandparentStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -143,13 +131,6 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~ParentStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -159,24 +140,23 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -191,10 +171,6 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -215,8 +191,8 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -234,13 +210,6 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport ~NestedStructElementPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -250,24 +219,23 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -282,10 +250,6 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -306,8 +270,8 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; @@ -325,13 +289,6 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~StructStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -341,24 +298,23 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -373,10 +329,6 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -397,8 +349,8 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx index 22ad76ec79b..61562796504 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx @@ -33,26 +33,21 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; UnionStructPubSubType::UnionStructPubSubType() { - setName("UnionStruct"); - uint32_t type_size = -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(UnionStruct::getMaxCdrSerializedSize()); -#else - UnionStruct_max_cdr_typesize; -#endif + set_name("UnionStruct"); + uint32_t type_size = UnionStruct_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ - m_typeSize = type_size + 4; /*encapsulation*/ - m_isGetKeyDefined = false; - uint32_t keyLength = UnionStruct_max_key_cdr_typesize > 16 ? UnionStruct_max_key_cdr_typesize : 16; - m_keyBuffer = reinterpret_cast(malloc(keyLength)); - memset(m_keyBuffer, 0, keyLength); + max_serialized_type_size = type_size + 4; /*encapsulation*/ + is_compute_key_provided = false; + uint32_t key_length = UnionStruct_max_key_cdr_typesize > 16 ? UnionStruct_max_key_cdr_typesize : 16; + key_buffer_ = reinterpret_cast(malloc(key_length)); + memset(key_buffer_, 0, key_length); } UnionStructPubSubType::~UnionStructPubSubType() { - if (m_keyBuffer != nullptr) + if (key_buffer_ != nullptr) { - free(m_keyBuffer); + free(key_buffer_); } } @@ -70,12 +65,10 @@ bool UnionStructPubSubType::serialize( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; -#if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2); -#endif // FASTCDR_VERSION_MAJOR > 1 try { @@ -90,11 +83,7 @@ bool UnionStructPubSubType::serialize( } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 return true; } @@ -111,11 +100,7 @@ bool UnionStructPubSubType::deserialize( eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that deserializes the data. - eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN -#if FASTCDR_VERSION_MAJOR == 1 - , eprosima::fastcdr::Cdr::CdrType::DDS_CDR -#endif // FASTCDR_VERSION_MAJOR == 1 - ); + eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); @@ -132,52 +117,62 @@ bool UnionStructPubSubType::deserialize( return true; } -std::function UnionStructPubSubType::getSerializedSizeProvider( +uint32_t UnionStructPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { - return [data, data_representation]() -> uint32_t - { -#if FASTCDR_VERSION_MAJOR == 1 - static_cast(data_representation); - return static_cast(type::getCdrSerializedSize(*static_cast(data))) + - 4u /*encapsulation*/; -#else - try - { - eprosima::fastcdr::CdrSizeCalculator calculator( - data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? - eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); - size_t current_alignment {0}; - return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; - } - catch (eprosima::fastcdr::exception::Exception& /*exception*/) - { - return 0; - } -#endif // FASTCDR_VERSION_MAJOR == 1 - }; + try + { + eprosima::fastcdr::CdrSizeCalculator calculator( + data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? + eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); + size_t current_alignment {0}; + return static_cast(calculator.calculate_serialized_size( + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; + } + catch (eprosima::fastcdr::exception::Exception& /*exception*/) + { + return 0; + } } -void* UnionStructPubSubType::createData() +void* UnionStructPubSubType::create_data() { return reinterpret_cast(new UnionStruct()); } -void UnionStructPubSubType::deleteData( +void UnionStructPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool UnionStructPubSubType::getKey( +bool UnionStructPubSubType::compute_key( + SerializedPayload_t* payload, + InstanceHandle_t* handle, + bool force_md5) +{ + if (!is_compute_key_provided) + { + return false; + } + + UnionStruct data; + if (deserialize(payload, static_cast(&data))) + { + return compute_key(static_cast(&data), handle, force_md5); + } + + return false; +} + +bool UnionStructPubSubType::compute_key( const void* const data, InstanceHandle_t* handle, bool force_md5) { - if (!m_isGetKeyDefined) + if (!is_compute_key_provided) { return false; } @@ -185,35 +180,27 @@ bool UnionStructPubSubType::getKey( const UnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(m_keyBuffer), + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), UnionStruct_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 || UnionStruct_max_key_cdr_typesize > 16) { - m_md5.init(); -#if FASTCDR_VERSION_MAJOR == 1 - m_md5.update(m_keyBuffer, static_cast(ser.getSerializedDataLength())); -#else - m_md5.update(m_keyBuffer, static_cast(ser.get_serialized_data_length())); -#endif // FASTCDR_VERSION_MAJOR == 1 - m_md5.finalize(); + md5_.init(); + md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); + md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_md5.digest[i]; + handle->value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = m_keyBuffer[i]; + handle->value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp index bbd1b9e3986..86d15c99e42 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp @@ -32,10 +32,10 @@ #include "union_struct.hpp" -#if !defined(GEN_API_VER) || (GEN_API_VER != 2) +#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ Generated union_struct is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. -#endif // GEN_API_VER +#endif // FASTDDS_GEN_API_VER /*! @@ -52,13 +52,6 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport ~UnionStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload) override - { - return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - eProsima_user_DllExport bool serialize( const void* const data, eprosima::fastdds::rtps::SerializedPayload_t* payload, @@ -68,24 +61,23 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; - eProsima_user_DllExport std::function getSerializedSizeProvider( - const void* const data) override - { - return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); - } - - eProsima_user_DllExport std::function getSerializedSizeProvider( + eProsima_user_DllExport uint32_t calculate_serialized_size( const void* const data, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool getKey( + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + bool force_md5 = false) override; + + eProsima_user_DllExport bool compute_key( const void* const data, eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; - eProsima_user_DllExport void* createData() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void deleteData( + eProsima_user_DllExport void delete_data( void* data) override; //Register TypeObject representation in Fast DDS TypeObjectRegistry @@ -100,10 +92,6 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain() const override - { - return false; - } eProsima_user_DllExport inline bool is_plain( eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override @@ -124,8 +112,8 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eprosima::fastdds::MD5 m_md5; - unsigned char* m_keyBuffer; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; }; From b1ceea7410537ac88d2b1a1fdc4596d334ecd6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Tue, 16 Jul 2024 08:32:14 +0200 Subject: [PATCH 08/14] Refs #21349. Apply suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../ConfigurationPubSubTypes.cxx | 24 +- .../ConfigurationPubSubTypes.hpp | 10 +- .../content_filter/HelloWorldPubSubTypes.cxx | 24 +- .../content_filter/HelloWorldPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- examples/cpp/dds/Keys/samplePubSubTypes.cxx | 24 +- examples/cpp/dds/Keys/samplePubSubTypes.hpp | 10 +- .../LoanableHelloWorldPubSubTypes.cxx | 24 +- .../LoanableHelloWorldPubSubTypes.hpp | 10 +- .../LoanableHelloWorldPubSubTypes.cxx | 24 +- .../LoanableHelloWorldPubSubTypes.hpp | 10 +- .../DeliveryMechanismsPubSubTypes.cxx | 24 +- .../DeliveryMechanismsPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- .../flow_control/FlowControlPubSubTypes.cxx | 26 +- .../flow_control/FlowControlPubSubTypes.hpp | 10 +- .../cpp/hello_world/HelloWorldPubSubTypes.cxx | 24 +- .../cpp/hello_world/HelloWorldPubSubTypes.hpp | 10 +- .../types/CalculatorPubSubTypes.cxx | 52 +- .../types/CalculatorPubSubTypes.hpp | 20 +- .../cpp/security/HelloWorldPubSubTypes.cxx | 24 +- .../cpp/security/HelloWorldPubSubTypes.hpp | 10 +- .../HelloWorldPubSubTypes.cxx | 24 +- .../HelloWorldPubSubTypes.hpp | 10 +- include/fastdds/dds/topic/TopicDataType.hpp | 10 +- include/fastdds/dds/topic/TypeSupport.hpp | 24 +- .../dynamic_types/DynamicPubSubType.hpp | 10 +- .../dds_xtypes_typeobjectPubSubTypes.hpp | 970 +-- .../type_lookup_service/TypeLookupManager.cpp | 4 +- .../detail/TypeLookupTypesPubSubTypes.cxx | 144 +- .../detail/TypeLookupTypesPubSubTypes.hpp | 60 +- .../detail/rpc_typesPubSubTypes.cxx | 144 +- .../detail/rpc_typesPubSubTypes.hpp | 60 +- src/cpp/fastdds/publisher/DataWriterImpl.cpp | 12 +- src/cpp/fastdds/subscriber/DataReaderImpl.cpp | 2 +- .../DataReaderImpl/ReadTakeCommand.hpp | 2 +- .../DataReaderImpl/SampleLoanManager.hpp | 2 +- .../subscriber/history/DataReaderHistory.cpp | 9 +- .../subscriber/history/DataReaderHistory.hpp | 3 - src/cpp/fastdds/topic/TypeSupport.cpp | 4 +- .../dynamic_types/DynamicPubSubType.cpp | 34 +- .../dds_xtypes_typeobjectPubSubTypes.cxx | 2328 +++--- .../rtps/monitor-service/MonitorService.cpp | 4 +- .../types/monitorservice_typesPubSubTypes.cxx | 168 +- .../types/monitorservice_typesPubSubTypes.hpp | 70 +- src/cpp/statistics/types/typesPubSubTypes.cxx | 336 +- src/cpp/statistics/types/typesPubSubTypes.hpp | 140 +- .../DDSBlackboxTestsDataRepresentationQos.cpp | 6 +- .../common/DDSBlackboxTestsFindTopic.cpp | 10 +- .../common/DDSBlackboxTestsListeners.cpp | 10 +- test/blackbox/types/Data1mbPubSubTypes.cxx | 24 +- test/blackbox/types/Data1mbPubSubTypes.hpp | 10 +- test/blackbox/types/Data64kbPubSubTypes.cxx | 24 +- test/blackbox/types/Data64kbPubSubTypes.hpp | 10 +- test/blackbox/types/FixedSizedPubSubTypes.cxx | 24 +- test/blackbox/types/FixedSizedPubSubTypes.hpp | 10 +- test/blackbox/types/HelloWorldPubSubTypes.cxx | 24 +- test/blackbox/types/HelloWorldPubSubTypes.hpp | 10 +- .../types/KeyedData1mbPubSubTypes.cxx | 24 +- .../types/KeyedData1mbPubSubTypes.hpp | 10 +- .../types/KeyedHelloWorldPubSubTypes.cxx | 24 +- .../types/KeyedHelloWorldPubSubTypes.hpp | 10 +- test/blackbox/types/StringTestPubSubTypes.cxx | 24 +- test/blackbox/types/StringTestPubSubTypes.hpp | 10 +- .../types/TestRegression3361PubSubTypes.cxx | 24 +- .../types/TestRegression3361PubSubTypes.hpp | 10 +- .../types/UnboundedHelloWorldPubSubTypes.cxx | 24 +- .../types/UnboundedHelloWorldPubSubTypes.hpp | 10 +- .../types/core/core_typesPubSubTypes.cxx | 528 +- .../types/core/core_typesPubSubTypes.hpp | 220 +- .../monitorservice_typesPubSubTypes.cxx | 168 +- .../monitorservice_typesPubSubTypes.hpp | 70 +- .../types/statistics/typesPubSubTypes.cxx | 336 +- .../types/statistics/typesPubSubTypes.hpp | 140 +- test/dds-types-test/aliasesPubSubTypes.cxx | 600 +- test/dds-types-test/aliasesPubSubTypes.hpp | 250 +- .../dds-types-test/annotationsPubSubTypes.cxx | 72 +- .../dds-types-test/annotationsPubSubTypes.hpp | 30 +- test/dds-types-test/appendablePubSubTypes.cxx | 456 +- test/dds-types-test/appendablePubSubTypes.hpp | 190 +- test/dds-types-test/arraysPubSubTypes.cxx | 2496 +++---- test/dds-types-test/arraysPubSubTypes.hpp | 1040 +-- test/dds-types-test/bitsetsPubSubTypes.cxx | 24 +- test/dds-types-test/bitsetsPubSubTypes.hpp | 10 +- test/dds-types-test/constantsPubSubTypes.cxx | 72 +- test/dds-types-test/constantsPubSubTypes.hpp | 30 +- .../declarationsPubSubTypes.cxx | 144 +- .../declarationsPubSubTypes.hpp | 60 +- .../enumerationsPubSubTypes.cxx | 72 +- .../enumerationsPubSubTypes.hpp | 30 +- test/dds-types-test/externalPubSubTypes.cxx | 648 +- test/dds-types-test/externalPubSubTypes.hpp | 270 +- test/dds-types-test/finalPubSubTypes.cxx | 456 +- test/dds-types-test/finalPubSubTypes.hpp | 190 +- .../helpers/basic_inner_typesPubSubTypes.cxx | 48 +- .../helpers/basic_inner_typesPubSubTypes.hpp | 20 +- .../dds-types-test/inheritancePubSubTypes.cxx | 192 +- .../dds-types-test/inheritancePubSubTypes.hpp | 80 +- test/dds-types-test/keyPubSubTypes.cxx | 408 +- test/dds-types-test/keyPubSubTypes.hpp | 170 +- test/dds-types-test/mapsPubSubTypes.cxx | 6288 ++++++++--------- test/dds-types-test/mapsPubSubTypes.hpp | 2620 +++---- test/dds-types-test/member_idPubSubTypes.cxx | 288 +- test/dds-types-test/member_idPubSubTypes.hpp | 120 +- test/dds-types-test/mutablePubSubTypes.cxx | 456 +- test/dds-types-test/mutablePubSubTypes.hpp | 190 +- test/dds-types-test/optionalPubSubTypes.cxx | 1944 ++--- test/dds-types-test/optionalPubSubTypes.hpp | 810 +-- test/dds-types-test/primitivesPubSubTypes.cxx | 504 +- test/dds-types-test/primitivesPubSubTypes.hpp | 210 +- .../relative_path_includePubSubTypes.cxx | 24 +- .../relative_path_includePubSubTypes.hpp | 10 +- test/dds-types-test/sequencesPubSubTypes.cxx | 672 +- test/dds-types-test/sequencesPubSubTypes.hpp | 280 +- test/dds-types-test/stringsPubSubTypes.cxx | 144 +- test/dds-types-test/stringsPubSubTypes.hpp | 60 +- test/dds-types-test/structuresPubSubTypes.cxx | 816 +-- test/dds-types-test/structuresPubSubTypes.hpp | 340 +- test/dds-types-test/unionsPubSubTypes.cxx | 984 +-- test/dds-types-test/unionsPubSubTypes.hpp | 410 +- .../DynamicTypesDDSTypesTest.hpp | 10 +- .../dynamic_types/DynamicTypesTests.cpp | 10 +- test/performance/latency/LatencyTestTypes.cpp | 20 +- test/performance/latency/LatencyTestTypes.hpp | 20 +- .../throughput/ThroughputTypes.cpp | 76 +- .../throughput/ThroughputTypes.hpp | 20 +- test/profiling/MemoryTestTypes.cpp | 28 +- test/profiling/MemoryTestTypes.h | 20 +- .../allocations/AllocTestTypePubSubTypes.cxx | 24 +- .../allocations/AllocTestTypePubSubTypes.hpp | 10 +- .../dds/participant/ParticipantTests.cpp | 22 +- .../dds/publisher/DataWriterTests.cpp | 52 +- .../unittest/dds/publisher/PublisherTests.cpp | 20 +- test/unittest/dds/status/ListenerTests.cpp | 10 +- .../dds/subscriber/DataReaderHistoryTests.cpp | 10 +- .../dds/subscriber/DataReaderTests.cpp | 22 +- .../dds/subscriber/FooBoundedTypeSupport.hpp | 24 +- .../dds/subscriber/FooTypeSupport.hpp | 28 +- .../dds/subscriber/SubscriberTests.cpp | 12 +- .../topic/DDSSQLFilter/DDSSQLFilterTests.cpp | 2 +- .../ContentFilterTestTypePubSubTypes.cxx | 48 +- .../ContentFilterTestTypePubSubTypes.hpp | 20 +- test/unittest/dds/topic/TopicTests.cpp | 10 +- .../gen/alias_structPubSubTypes.cxx | 24 +- .../gen/alias_structPubSubTypes.hpp | 10 +- .../gen/array_structPubSubTypes.cxx | 72 +- .../gen/array_structPubSubTypes.hpp | 30 +- .../gen/bitmask_structPubSubTypes.cxx | 24 +- .../gen/bitmask_structPubSubTypes.hpp | 10 +- .../gen/bitset_structPubSubTypes.cxx | 24 +- .../gen/bitset_structPubSubTypes.hpp | 10 +- .../gen/enum_structPubSubTypes.cxx | 24 +- .../gen/enum_structPubSubTypes.hpp | 10 +- .../gen/extensibility_structPubSubTypes.cxx | 96 +- .../gen/extensibility_structPubSubTypes.hpp | 40 +- .../key_struct/gen/key_structPubSubTypes.cxx | 48 +- .../key_struct/gen/key_structPubSubTypes.hpp | 20 +- .../map_struct/gen/map_structPubSubTypes.cxx | 48 +- .../map_struct/gen/map_structPubSubTypes.hpp | 20 +- .../gen/primitives_structPubSubTypes.cxx | 24 +- .../gen/primitives_structPubSubTypes.hpp | 10 +- .../gen/sequence_structPubSubTypes.cxx | 72 +- .../gen/sequence_structPubSubTypes.hpp | 30 +- .../gen/string_structPubSubTypes.cxx | 24 +- .../gen/string_structPubSubTypes.hpp | 10 +- .../gen/struct_structPubSubTypes.cxx | 96 +- .../gen/struct_structPubSubTypes.hpp | 40 +- .../gen/union_structPubSubTypes.cxx | 24 +- .../gen/union_structPubSubTypes.hpp | 10 +- .../gen/ComprehensiveTypePubSubTypes.cxx | 72 +- .../gen/ComprehensiveTypePubSubTypes.hpp | 30 +- ...sDomainParticipantStatusQueryableTests.cpp | 10 +- .../dds/StatisticsDomainParticipantTests.cpp | 10 +- 181 files changed, 16817 insertions(+), 16819 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx index 343ee299b59..da5b125986f 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx @@ -53,18 +53,18 @@ ConfigurationPubSubType::~ConfigurationPubSubType() bool ConfigurationPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Configuration* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool ConfigurationPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ConfigurationPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool ConfigurationPubSubType::deserialize( Configuration* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void ConfigurationPubSubType::delete_data( } bool ConfigurationPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool ConfigurationPubSubType::compute_key( bool ConfigurationPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool ConfigurationPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index 941f28c2fb3..c9a1178ff3e 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -54,11 +54,11 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index 52686589b0f..56aac916f19 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx index 18e2eed9f84..a773370ace4 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx @@ -53,18 +53,18 @@ samplePubSubType::~samplePubSubType() bool samplePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sample* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool samplePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool samplePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool samplePubSubType::deserialize( sample* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void samplePubSubType::delete_data( } bool samplePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool samplePubSubType::compute_key( bool samplePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool samplePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index cb8a7c0dde7..cbc82ef71f5 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -54,11 +54,11 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx index 9577938f8c9..adbd9673905 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ LoanableHelloWorldPubSubType::~LoanableHelloWorldPubSubType() bool LoanableHelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool LoanableHelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LoanableHelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool LoanableHelloWorldPubSubType::deserialize( LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void LoanableHelloWorldPubSubType::delete_data( } bool LoanableHelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool LoanableHelloWorldPubSubType::compute_key( bool LoanableHelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool LoanableHelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index fcc345a615b..3d154f59dae 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -87,11 +87,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -99,13 +99,13 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx index 9577938f8c9..adbd9673905 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ LoanableHelloWorldPubSubType::~LoanableHelloWorldPubSubType() bool LoanableHelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool LoanableHelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LoanableHelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool LoanableHelloWorldPubSubType::deserialize( LoanableHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void LoanableHelloWorldPubSubType::delete_data( } bool LoanableHelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool LoanableHelloWorldPubSubType::compute_key( bool LoanableHelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool LoanableHelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index fcc345a615b..3d154f59dae 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -87,11 +87,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -99,13 +99,13 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx index 07ac147c318..cb3e2b18d4d 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx @@ -53,18 +53,18 @@ DeliveryMechanismsPubSubType::~DeliveryMechanismsPubSubType() bool DeliveryMechanismsPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DeliveryMechanisms* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool DeliveryMechanismsPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DeliveryMechanismsPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool DeliveryMechanismsPubSubType::deserialize( DeliveryMechanisms* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void DeliveryMechanismsPubSubType::delete_data( } bool DeliveryMechanismsPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool DeliveryMechanismsPubSubType::compute_key( bool DeliveryMechanismsPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool DeliveryMechanismsPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 8cba1511851..86540cb8040 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -87,11 +87,11 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -99,13 +99,13 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx index 9909d718444..1100f812674 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx @@ -53,18 +53,18 @@ FlowControlPubSubType::~FlowControlPubSubType() bool FlowControlPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FlowControl* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool FlowControlPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } -bool FlowControlPubSubType::deserialize( - SerializedPayload_t* payload, +bool FlowControlExamplePubSubType::deserialize( + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool FlowControlPubSubType::deserialize( FlowControl* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void FlowControlExamplePubSubType::delete_data( } bool FlowControlExamplePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool FlowControlExamplePubSubType::compute_key( bool FlowControlExamplePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -194,14 +194,14 @@ bool FlowControlExamplePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index d8713e99d6b..f6e0e8c8a25 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -54,11 +54,11 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx index 8c58c842b88..df199015da6 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx @@ -53,18 +53,18 @@ CalculatorRequestTypePubSubType::~CalculatorRequestTypePubSubType() bool CalculatorRequestTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CalculatorRequestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool CalculatorRequestTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } -bool CalculatorRequestTypePubSubType::deserialize( - SerializedPayload_t* payload, +bool RequestTypePubSubType::deserialize( + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool CalculatorRequestTypePubSubType::deserialize( CalculatorRequestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void RequestTypePubSubType::delete_data( } bool RequestTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool RequestTypePubSubType::compute_key( bool RequestTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -194,14 +194,14 @@ bool RequestTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -234,18 +234,18 @@ CalculatorReplyTypePubSubType::~CalculatorReplyTypePubSubType() bool CalculatorReplyTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CalculatorReplyType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -264,12 +264,12 @@ bool CalculatorReplyTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } -bool CalculatorReplyTypePubSubType::deserialize( - SerializedPayload_t* payload, +bool ReplyTypePubSubType::deserialize( + SerializedPayload_t& payload, void* data) { try @@ -278,14 +278,14 @@ bool CalculatorReplyTypePubSubType::deserialize( CalculatorReplyType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -330,8 +330,8 @@ void ReplyTypePubSubType::delete_data( } bool ReplyTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -350,7 +350,7 @@ bool ReplyTypePubSubType::compute_key( bool ReplyTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -375,14 +375,14 @@ bool ReplyTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index 47e8a137a7e..12c59033738 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -54,11 +54,11 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/security/HelloWorldPubSubTypes.cxx b/examples/cpp/security/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/security/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx index 9e71be84693..f9a6f740dbf 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index 66df48a84cb..70e4cd9df99 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 3756d6b3919..05862fbe32f 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -83,7 +83,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool serialize( const void* const data, - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation) = 0; /** @@ -94,7 +94,7 @@ class TopicDataType * @return True if correct. */ FASTDDS_EXPORTED_API virtual bool deserialize( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, void* data) = 0; /*! @@ -131,8 +131,8 @@ class TopicDataType * @return True if correct. */ FASTDDS_EXPORTED_API virtual bool compute_key( - fastdds::rtps::SerializedPayload_t* payload, - fastdds::rtps::InstanceHandle_t* ihandle, + fastdds::rtps::SerializedPayload_t& payload, + fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) = 0; /** @@ -145,7 +145,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool compute_key( const void* const data, - fastdds::rtps::InstanceHandle_t* ihandle, + fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) = 0; /** diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index 19debccc4c4..9f3cf325eb0 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -149,7 +149,7 @@ class TypeSupport : public std::shared_ptr */ FASTDDS_EXPORTED_API virtual bool serialize( const void* const data, - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation); /** @@ -160,7 +160,7 @@ class TypeSupport : public std::shared_ptr * @return true if it is deserialized correctly, false if not */ FASTDDS_EXPORTED_API virtual bool deserialize( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, void* data); /*! @@ -201,19 +201,35 @@ class TypeSupport : public std::shared_ptr /** * @brief Getter for the data key * - * @param data Pointer to data + * @param data Pointer to serialized payload containing the data. * @param i_handle InstanceHandle pointer to store the key * @param force_md5 boolean to force md5 (default: false) * @return true if the key is returned, false if not */ FASTDDS_EXPORTED_API virtual bool compute_key( void* data, - InstanceHandle_t* i_handle, + InstanceHandle_t& i_handle, bool force_md5 = false) { return get()->compute_key(data, i_handle, force_md5); } + /** + * @brief Getter for the data key + * + * @param payload Pointer to data + * @param i_handle InstanceHandle pointer to store the key + * @param force_md5 boolean to force md5 (default: false) + * @return true if the key is returned, false if not + */ + FASTDDS_EXPORTED_API virtual bool compute_key( + fastdds::rtps::SerializedPayload_t& payload, + InstanceHandle_t& i_handle, + bool force_md5 = false) + { + return get()->compute_key(payload, i_handle, force_md5); + } + FASTDDS_EXPORTED_API virtual bool operator ==( const TypeSupport& type_support) { diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp index 1c5382dac09..8445e6ae1cc 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp @@ -73,7 +73,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType * @return bool specifying success */ FASTDDS_EXPORTED_API bool deserialize ( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; /* @@ -90,8 +90,8 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType * @return bool specifying success */ FASTDDS_EXPORTED_API bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; /* @@ -103,7 +103,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType */ FASTDDS_EXPORTED_API bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; /* @@ -125,7 +125,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType */ FASTDDS_EXPORTED_API bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, fastdds::dds::DataRepresentationId_t data_representation) override; /* diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index 3ea6e57e82a..a91c109515a 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -178,11 +178,11 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -190,13 +190,13 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -312,11 +312,11 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -324,13 +324,13 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -413,11 +413,11 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -425,13 +425,13 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -492,11 +492,11 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -504,13 +504,13 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -571,11 +571,11 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -583,13 +583,13 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -650,11 +650,11 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -662,13 +662,13 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -729,11 +729,11 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -741,13 +741,13 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -808,11 +808,11 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -820,13 +820,13 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -887,11 +887,11 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -899,13 +899,13 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -966,11 +966,11 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -978,13 +978,13 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1045,11 +1045,11 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1057,13 +1057,13 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1124,11 +1124,11 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1136,13 +1136,13 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1226,11 +1226,11 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1238,13 +1238,13 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1306,11 +1306,11 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1318,13 +1318,13 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1386,11 +1386,11 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1398,13 +1398,13 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1466,11 +1466,11 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1478,13 +1478,13 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1545,11 +1545,11 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1557,13 +1557,13 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1624,11 +1624,11 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1636,13 +1636,13 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1703,11 +1703,11 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1715,13 +1715,13 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1815,11 +1815,11 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1827,13 +1827,13 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1916,11 +1916,11 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1928,13 +1928,13 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1996,11 +1996,11 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2008,13 +2008,13 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2076,11 +2076,11 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2088,13 +2088,13 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2155,11 +2155,11 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2167,13 +2167,13 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2252,11 +2252,11 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2264,13 +2264,13 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2331,11 +2331,11 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2343,13 +2343,13 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2410,11 +2410,11 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2422,13 +2422,13 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2489,11 +2489,11 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2501,13 +2501,13 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2568,11 +2568,11 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2580,13 +2580,13 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2648,11 +2648,11 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2660,13 +2660,13 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2727,11 +2727,11 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2739,13 +2739,13 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2807,11 +2807,11 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2819,13 +2819,13 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2887,11 +2887,11 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2899,13 +2899,13 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2966,11 +2966,11 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2978,13 +2978,13 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3045,11 +3045,11 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3057,13 +3057,13 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3124,11 +3124,11 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3136,13 +3136,13 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3203,11 +3203,11 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3215,13 +3215,13 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3282,11 +3282,11 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3294,13 +3294,13 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3361,11 +3361,11 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3373,13 +3373,13 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3440,11 +3440,11 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3452,13 +3452,13 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3519,11 +3519,11 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3531,13 +3531,13 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3599,11 +3599,11 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3611,13 +3611,13 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3679,11 +3679,11 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3691,13 +3691,13 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3758,11 +3758,11 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3770,13 +3770,13 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3837,11 +3837,11 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3849,13 +3849,13 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3916,11 +3916,11 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3928,13 +3928,13 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3995,11 +3995,11 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4007,13 +4007,13 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4074,11 +4074,11 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4086,13 +4086,13 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4153,11 +4153,11 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4165,13 +4165,13 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4232,11 +4232,11 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4244,13 +4244,13 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4311,11 +4311,11 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4323,13 +4323,13 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4390,11 +4390,11 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4402,13 +4402,13 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4469,11 +4469,11 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4481,13 +4481,13 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4548,11 +4548,11 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4560,13 +4560,13 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4627,11 +4627,11 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4639,13 +4639,13 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4706,11 +4706,11 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4718,13 +4718,13 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4785,11 +4785,11 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4797,13 +4797,13 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4897,11 +4897,11 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4909,13 +4909,13 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4998,11 +4998,11 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5010,13 +5010,13 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5077,11 +5077,11 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5089,13 +5089,13 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5156,11 +5156,11 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5168,13 +5168,13 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5235,11 +5235,11 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5247,13 +5247,13 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5314,11 +5314,11 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5326,13 +5326,13 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5393,11 +5393,11 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5405,13 +5405,13 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5472,11 +5472,11 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5484,13 +5484,13 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5551,11 +5551,11 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5563,13 +5563,13 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5630,11 +5630,11 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5642,13 +5642,13 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5709,11 +5709,11 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5721,13 +5721,13 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5788,11 +5788,11 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5800,13 +5800,13 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5868,11 +5868,11 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5880,13 +5880,13 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5947,11 +5947,11 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5959,13 +5959,13 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6027,11 +6027,11 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6039,13 +6039,13 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6140,11 +6140,11 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6152,13 +6152,13 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6241,11 +6241,11 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6253,13 +6253,13 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6320,11 +6320,11 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6332,13 +6332,13 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6399,11 +6399,11 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6411,13 +6411,13 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6478,11 +6478,11 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6490,13 +6490,13 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6557,11 +6557,11 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6569,13 +6569,13 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6636,11 +6636,11 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6648,13 +6648,13 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6716,11 +6716,11 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6728,13 +6728,13 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6829,11 +6829,11 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6841,13 +6841,13 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6932,11 +6932,11 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6944,13 +6944,13 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7011,11 +7011,11 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7023,13 +7023,13 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7090,11 +7090,11 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7102,13 +7102,13 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7169,11 +7169,11 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7181,13 +7181,13 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7249,11 +7249,11 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7261,13 +7261,13 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7329,11 +7329,11 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7341,13 +7341,13 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7408,11 +7408,11 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7420,13 +7420,13 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7487,11 +7487,11 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7499,13 +7499,13 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7566,11 +7566,11 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7578,13 +7578,13 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7645,11 +7645,11 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7657,13 +7657,13 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7725,11 +7725,11 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7737,13 +7737,13 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7808,11 +7808,11 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7820,13 +7820,13 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7888,11 +7888,11 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7900,13 +7900,13 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7968,11 +7968,11 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7980,13 +7980,13 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8048,11 +8048,11 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8060,13 +8060,13 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8128,11 +8128,11 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8140,13 +8140,13 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp index dd97d324c3f..4d895f1b45e 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp @@ -720,7 +720,7 @@ bool TypeLookupManager::send_impl( } // Serialize the message using the provided PubSubType - bool result = pubsubtype->serialize(&msg, &change->serializedPayload, + bool result = pubsubtype->serialize(&msg, change->serializedPayload, DataRepresentationId_t::XCDR2_DATA_REPRESENTATION); // If serialization was successful, update the change and add it to the WriterHistory if (result) @@ -798,7 +798,7 @@ bool TypeLookupManager::receive_impl( return false; } - bool result = pubsubtype->deserialize(&payload, &msg); + bool result = pubsubtype->deserialize(payload, &msg); payload.data = nullptr; return result; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx index a3de8cd1a95..47afc23994f 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx @@ -59,18 +59,18 @@ namespace builtin { bool TypeLookup_getTypes_InPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_getTypes_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -89,12 +89,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_getTypes_InPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -103,14 +103,14 @@ namespace builtin { TypeLookup_getTypes_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -155,8 +155,8 @@ namespace builtin { } bool TypeLookup_getTypes_InPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -175,7 +175,7 @@ namespace builtin { bool TypeLookup_getTypes_InPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -199,14 +199,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -240,18 +240,18 @@ namespace builtin { bool TypeLookup_getTypes_OutPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_getTypes_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -270,12 +270,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_getTypes_OutPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -284,14 +284,14 @@ namespace builtin { TypeLookup_getTypes_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -336,8 +336,8 @@ namespace builtin { } bool TypeLookup_getTypes_OutPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -356,7 +356,7 @@ namespace builtin { bool TypeLookup_getTypes_OutPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -380,14 +380,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -422,18 +422,18 @@ namespace builtin { bool TypeLookup_getTypeDependencies_InPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_getTypeDependencies_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -452,12 +452,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_getTypeDependencies_InPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -466,14 +466,14 @@ namespace builtin { TypeLookup_getTypeDependencies_In* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -518,8 +518,8 @@ namespace builtin { } bool TypeLookup_getTypeDependencies_InPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -538,7 +538,7 @@ namespace builtin { bool TypeLookup_getTypeDependencies_InPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -562,14 +562,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -603,18 +603,18 @@ namespace builtin { bool TypeLookup_getTypeDependencies_OutPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_getTypeDependencies_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -633,12 +633,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_getTypeDependencies_OutPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -647,14 +647,14 @@ namespace builtin { TypeLookup_getTypeDependencies_Out* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -699,8 +699,8 @@ namespace builtin { } bool TypeLookup_getTypeDependencies_OutPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -719,7 +719,7 @@ namespace builtin { bool TypeLookup_getTypeDependencies_OutPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -743,14 +743,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -786,18 +786,18 @@ namespace builtin { bool TypeLookup_RequestPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_Request* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -816,12 +816,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_RequestPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -830,14 +830,14 @@ namespace builtin { TypeLookup_Request* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -882,8 +882,8 @@ namespace builtin { } bool TypeLookup_RequestPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -902,7 +902,7 @@ namespace builtin { bool TypeLookup_RequestPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -926,14 +926,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -968,18 +968,18 @@ namespace builtin { bool TypeLookup_ReplyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeLookup_Reply* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -998,12 +998,12 @@ namespace builtin { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeLookup_ReplyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1012,14 +1012,14 @@ namespace builtin { TypeLookup_Reply* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1064,8 +1064,8 @@ namespace builtin { } bool TypeLookup_ReplyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1084,7 +1084,7 @@ namespace builtin { bool TypeLookup_ReplyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1108,14 +1108,14 @@ namespace builtin { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index 4378d81c7b6..7aebb900447 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -66,11 +66,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -78,13 +78,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -145,11 +145,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -157,13 +157,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -225,11 +225,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -237,13 +237,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -304,11 +304,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -316,13 +316,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -385,11 +385,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -397,13 +397,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -465,11 +465,11 @@ namespace builtin eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -477,13 +477,13 @@ namespace builtin eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx index f3266aeb0d6..44f359afde4 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx @@ -58,18 +58,18 @@ EntityId_tPubSubType::~EntityId_tPubSubType() bool EntityId_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -88,12 +88,12 @@ bool EntityId_tPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityId_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -102,14 +102,14 @@ bool EntityId_tPubSubType::deserialize( EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -154,8 +154,8 @@ void EntityId_tPubSubType::delete_data( } bool EntityId_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -174,7 +174,7 @@ bool EntityId_tPubSubType::compute_key( bool EntityId_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -198,14 +198,14 @@ bool EntityId_tPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -239,18 +239,18 @@ GUID_tPubSubType::~GUID_tPubSubType() bool GUID_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -269,12 +269,12 @@ bool GUID_tPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GUID_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -283,14 +283,14 @@ bool GUID_tPubSubType::deserialize( GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -335,8 +335,8 @@ void GUID_tPubSubType::delete_data( } bool GUID_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -355,7 +355,7 @@ bool GUID_tPubSubType::compute_key( bool GUID_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -379,14 +379,14 @@ bool GUID_tPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -420,18 +420,18 @@ SequenceNumber_tPubSubType::~SequenceNumber_tPubSubType() bool SequenceNumber_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -450,12 +450,12 @@ bool SequenceNumber_tPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceNumber_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -464,14 +464,14 @@ bool SequenceNumber_tPubSubType::deserialize( SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -516,8 +516,8 @@ void SequenceNumber_tPubSubType::delete_data( } bool SequenceNumber_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -536,7 +536,7 @@ bool SequenceNumber_tPubSubType::compute_key( bool SequenceNumber_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -560,14 +560,14 @@ bool SequenceNumber_tPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -601,18 +601,18 @@ SampleIdentityPubSubType::~SampleIdentityPubSubType() bool SampleIdentityPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SampleIdentity* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -631,12 +631,12 @@ bool SampleIdentityPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SampleIdentityPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -645,14 +645,14 @@ bool SampleIdentityPubSubType::deserialize( SampleIdentity* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -697,8 +697,8 @@ void SampleIdentityPubSubType::delete_data( } bool SampleIdentityPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -717,7 +717,7 @@ bool SampleIdentityPubSubType::compute_key( bool SampleIdentityPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -741,14 +741,14 @@ bool SampleIdentityPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -783,18 +783,18 @@ namespace rpc { bool RequestHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const RequestHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -813,12 +813,12 @@ namespace rpc { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool RequestHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -827,14 +827,14 @@ namespace rpc { RequestHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -879,8 +879,8 @@ namespace rpc { } bool RequestHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -899,7 +899,7 @@ namespace rpc { bool RequestHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -923,14 +923,14 @@ namespace rpc { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -964,18 +964,18 @@ namespace rpc { bool ReplyHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ReplyHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -994,12 +994,12 @@ namespace rpc { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ReplyHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1008,14 +1008,14 @@ namespace rpc { ReplyHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1060,8 +1060,8 @@ namespace rpc { } bool ReplyHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1080,7 +1080,7 @@ namespace rpc { bool ReplyHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1104,14 +1104,14 @@ namespace rpc { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index d742715e42b..67d6d47b2e1 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -95,11 +95,11 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -107,13 +107,13 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -229,11 +229,11 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -241,13 +241,13 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -363,11 +363,11 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -375,13 +375,13 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -497,11 +497,11 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -509,13 +509,13 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -605,11 +605,11 @@ namespace rpc eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -617,13 +617,13 @@ namespace rpc eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -717,11 +717,11 @@ namespace rpc eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -729,13 +729,13 @@ namespace rpc eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index d283f624056..17426b637fd 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -674,7 +674,7 @@ ReturnCode_t DataWriterImpl::check_write_preconditions( #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_.get()->compute_key(data, &instance_handle, is_key_protected); + type_.get()->compute_key(data, instance_handle, is_key_protected); } //Check if the Handle is different from the special value HANDLE_NIL and @@ -763,7 +763,7 @@ ReturnCode_t DataWriterImpl::check_instance_preconditions( #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_->compute_key(data, &instance_handle, is_key_protected); + type_->compute_key(data, instance_handle, is_key_protected); } #if !defined(NDEBUG) @@ -838,7 +838,7 @@ InstanceHandle_t DataWriterImpl::do_register_instance( uint32_t size = fixed_payload_size_ ? fixed_payload_size_ : type_->calculate_serialized_size(key, data_representation_); payload->reserve(size); - if (!type_->serialize(key, payload, data_representation_)) + if (!type_->serialize(key, *payload, data_representation_)) { EPROSIMA_LOG_WARNING(DATA_WRITER, "Key data serialization failed"); @@ -954,7 +954,7 @@ ReturnCode_t DataWriterImpl::get_key_value( return RETCODE_BAD_PARAMETER; } - type_->deserialize(payload, key_holder); + type_->deserialize(*payload, key_holder); return RETCODE_OK; } @@ -1022,7 +1022,7 @@ ReturnCode_t DataWriterImpl::perform_create_new_change( return RETCODE_OUT_OF_RESOURCES; } - if ((ALIVE == change_kind) && !type_->serialize(data, &payload, data_representation_)) + if ((ALIVE == change_kind) && !type_->serialize(data, payload, data_representation_)) { EPROSIMA_LOG_WARNING(DATA_WRITER, "Data serialization returned false"); payload_pool_->release_payload(payload); @@ -1115,7 +1115,7 @@ ReturnCode_t DataWriterImpl::create_new_change_with_params( #if HAVE_SECURITY is_key_protected = writer_->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - type_->compute_key(data, &handle, is_key_protected); + type_->compute_key(data, handle, is_key_protected); } return perform_create_new_change(changeKind, data, wparams, handle); diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp index f459a002be5..70bbfc100f2 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp @@ -1987,7 +1987,7 @@ InstanceHandle_t DataReaderImpl::lookup_instance( if (instance && type_->is_compute_key_provided) { - if (type_->compute_key(const_cast(instance), &handle, false)) + if (type_->compute_key(const_cast(instance), handle, false)) { if (!history_.is_instance_present(handle)) { diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp index 3ce1d7be02f..92e36413daa 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp @@ -370,7 +370,7 @@ struct ReadTakeCommand if (data_values_.has_ownership()) { // perform deserialization - return type_->deserialize(payload, data_values_.buffer()[current_slot_]); + return type_->deserialize(*payload, data_values_.buffer()[current_slot_]); } else { diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp index f692ea9eeb2..e728582f244 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp @@ -140,7 +140,7 @@ struct SampleLoanManager } else { - type_->deserialize(&item->payload, item->sample); + type_->deserialize(item->payload, item->sample); } // Increment reference counter and return sample diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp index a8326097bb1..0dcd18a45dc 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp @@ -69,7 +69,6 @@ DataReaderHistory::DataReaderHistory( , type_name_(topic.get_type_name()) , has_keys_(type->is_compute_key_provided) , type_(type.get()) - , get_key_object_(nullptr) { if (resource_limited_qos_.max_samples <= 0) { @@ -88,8 +87,6 @@ DataReaderHistory::DataReaderHistory( if (type_->is_compute_key_provided) { - get_key_object_ = type_->create_data(); - if (resource_limited_qos_.max_samples_per_instance < std::numeric_limits::max()) { key_changes_allocation_.maximum = resource_limited_qos_.max_samples_per_instance; @@ -150,7 +147,7 @@ DataReaderHistory::DataReaderHistory( #if HAVE_SECURITY is_key_protected = mp_reader->getAttributes().security_attributes().is_key_protected; #endif // if HAVE_SECURITY - return type_->compute_key(&a_change->serializedPayload, &a_change->instanceHandle, + return type_->compute_key(a_change->serializedPayload, a_change->instanceHandle, is_key_protected); } @@ -163,10 +160,6 @@ DataReaderHistory::DataReaderHistory( DataReaderHistory::~DataReaderHistory() { - if (type_->is_compute_key_provided) - { - type_->delete_data(get_key_object_); - } } bool DataReaderHistory::can_change_be_added_nts( diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp index b9dea5ba1a8..16182cb77eb 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp @@ -390,9 +390,6 @@ class DataReaderHistory : public eprosima::fastdds::rtps::ReaderHistory //!TopicDataType fastdds::dds::TopicDataType* type_; - //!Type object to deserialize Key - void* get_key_object_; - /// Function to compute the instance handle of a received change std::function compute_key_for_change_fn_; /// Function processing a received change diff --git a/src/cpp/fastdds/topic/TypeSupport.cpp b/src/cpp/fastdds/topic/TypeSupport.cpp index ce137c068b1..9553fea7002 100644 --- a/src/cpp/fastdds/topic/TypeSupport.cpp +++ b/src/cpp/fastdds/topic/TypeSupport.cpp @@ -45,7 +45,7 @@ ReturnCode_t TypeSupport::register_type( bool TypeSupport::serialize( const void* const data, - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation) { bool result = false; @@ -62,7 +62,7 @@ bool TypeSupport::serialize( } bool TypeSupport::deserialize( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, void* data) { bool result = false; diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp index e0a5309ed3e..e2ec3ec6ac4 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp @@ -75,18 +75,18 @@ void DynamicPubSubType::delete_data( } bool DynamicPubSubType::deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) { traits::ref_type* data_ptr = static_cast::ref_type*>(data); - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); // Object that manages the raw buffer. + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that manages the raw buffer. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Object that deserializes the data. try { // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; deser >> *data_ptr; } @@ -103,8 +103,8 @@ traits::ref_type DynamicPubSubType::get_dynamic_type() const noexce } bool DynamicPubSubType::compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* handle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& handle, bool force_md5) { if (!dynamic_type_ || !is_compute_key_provided) @@ -112,12 +112,12 @@ bool DynamicPubSubType::compute_key( return false; } - traits::ref_type ret_val {traits::narrow( - DynamicDataFactory::get_instance()->create_data( - dynamic_type_))}; - if (deserialize(payload, static_cast(&ret_val))) + traits::ref_type temp_val {traits::narrow( + DynamicDataFactory::get_instance()->create_data( + dynamic_type_))}; + if (deserialize(payload, static_cast(&temp_val))) { - return compute_key(static_cast(&ret_val), handle, force_md5); + return compute_key(static_cast(&temp_val), handle, force_md5); } return false; @@ -125,7 +125,7 @@ bool DynamicPubSubType::compute_key( bool DynamicPubSubType::compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* handle, + eprosima::fastdds::rtps::InstanceHandle_t& handle, bool force_md5) { if (!dynamic_type_ || !is_compute_key_provided) @@ -156,14 +156,14 @@ bool DynamicPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -193,19 +193,19 @@ uint32_t DynamicPubSubType::calculate_serialized_size( bool DynamicPubSubType::serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, fastdds::dds::DataRepresentationId_t data_representation) { const traits::ref_type* data_ptr = static_cast::ref_type*>(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == fastdds::dds::DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion:: XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; auto type_impl = traits::narrow(dynamic_type_); ser.set_encoding_flag(get_fastcdr_encoding_flag(type_impl->get_descriptor().extensibility_kind(), @@ -225,7 +225,7 @@ bool DynamicPubSubType::serialize( return false; } - payload->length = (uint32_t)ser.get_serialized_data_length(); //Get the serialized length + payload.length = (uint32_t)ser.get_serialized_data_length(); //Get the serialized length return true; } diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx index dda5bb0a889..e00f7711ff0 100644 --- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx +++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx @@ -61,18 +61,18 @@ StringSTypeDefnPubSubType::~StringSTypeDefnPubSubType() bool StringSTypeDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StringSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -91,12 +91,12 @@ bool StringSTypeDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StringSTypeDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -105,14 +105,14 @@ bool StringSTypeDefnPubSubType::deserialize( StringSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -157,8 +157,8 @@ void StringSTypeDefnPubSubType::delete_data( } bool StringSTypeDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -177,7 +177,7 @@ bool StringSTypeDefnPubSubType::compute_key( bool StringSTypeDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -201,14 +201,14 @@ bool StringSTypeDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -242,18 +242,18 @@ StringLTypeDefnPubSubType::~StringLTypeDefnPubSubType() bool StringLTypeDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StringLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -272,12 +272,12 @@ bool StringLTypeDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StringLTypeDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -286,14 +286,14 @@ bool StringLTypeDefnPubSubType::deserialize( StringLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -338,8 +338,8 @@ void StringLTypeDefnPubSubType::delete_data( } bool StringLTypeDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -358,7 +358,7 @@ bool StringLTypeDefnPubSubType::compute_key( bool StringLTypeDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -382,14 +382,14 @@ bool StringLTypeDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -423,18 +423,18 @@ PlainCollectionHeaderPubSubType::~PlainCollectionHeaderPubSubType() bool PlainCollectionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -453,12 +453,12 @@ bool PlainCollectionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainCollectionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -467,14 +467,14 @@ bool PlainCollectionHeaderPubSubType::deserialize( PlainCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -519,8 +519,8 @@ void PlainCollectionHeaderPubSubType::delete_data( } bool PlainCollectionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -539,7 +539,7 @@ bool PlainCollectionHeaderPubSubType::compute_key( bool PlainCollectionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -563,14 +563,14 @@ bool PlainCollectionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -604,18 +604,18 @@ PlainSequenceSElemDefnPubSubType::~PlainSequenceSElemDefnPubSubType() bool PlainSequenceSElemDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainSequenceSElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -634,12 +634,12 @@ bool PlainSequenceSElemDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainSequenceSElemDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -648,14 +648,14 @@ bool PlainSequenceSElemDefnPubSubType::deserialize( PlainSequenceSElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -700,8 +700,8 @@ void PlainSequenceSElemDefnPubSubType::delete_data( } bool PlainSequenceSElemDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -720,7 +720,7 @@ bool PlainSequenceSElemDefnPubSubType::compute_key( bool PlainSequenceSElemDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -744,14 +744,14 @@ bool PlainSequenceSElemDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -785,18 +785,18 @@ PlainSequenceLElemDefnPubSubType::~PlainSequenceLElemDefnPubSubType() bool PlainSequenceLElemDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainSequenceLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -815,12 +815,12 @@ bool PlainSequenceLElemDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainSequenceLElemDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -829,14 +829,14 @@ bool PlainSequenceLElemDefnPubSubType::deserialize( PlainSequenceLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -881,8 +881,8 @@ void PlainSequenceLElemDefnPubSubType::delete_data( } bool PlainSequenceLElemDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -901,7 +901,7 @@ bool PlainSequenceLElemDefnPubSubType::compute_key( bool PlainSequenceLElemDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -925,14 +925,14 @@ bool PlainSequenceLElemDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -966,18 +966,18 @@ PlainArraySElemDefnPubSubType::~PlainArraySElemDefnPubSubType() bool PlainArraySElemDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainArraySElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -996,12 +996,12 @@ bool PlainArraySElemDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainArraySElemDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1010,14 +1010,14 @@ bool PlainArraySElemDefnPubSubType::deserialize( PlainArraySElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1062,8 +1062,8 @@ void PlainArraySElemDefnPubSubType::delete_data( } bool PlainArraySElemDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1082,7 +1082,7 @@ bool PlainArraySElemDefnPubSubType::compute_key( bool PlainArraySElemDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1106,14 +1106,14 @@ bool PlainArraySElemDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1147,18 +1147,18 @@ PlainArrayLElemDefnPubSubType::~PlainArrayLElemDefnPubSubType() bool PlainArrayLElemDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainArrayLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1177,12 +1177,12 @@ bool PlainArrayLElemDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainArrayLElemDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1191,14 +1191,14 @@ bool PlainArrayLElemDefnPubSubType::deserialize( PlainArrayLElemDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1243,8 +1243,8 @@ void PlainArrayLElemDefnPubSubType::delete_data( } bool PlainArrayLElemDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1263,7 +1263,7 @@ bool PlainArrayLElemDefnPubSubType::compute_key( bool PlainArrayLElemDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1287,14 +1287,14 @@ bool PlainArrayLElemDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1328,18 +1328,18 @@ PlainMapSTypeDefnPubSubType::~PlainMapSTypeDefnPubSubType() bool PlainMapSTypeDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainMapSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1358,12 +1358,12 @@ bool PlainMapSTypeDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainMapSTypeDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1372,14 +1372,14 @@ bool PlainMapSTypeDefnPubSubType::deserialize( PlainMapSTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1424,8 +1424,8 @@ void PlainMapSTypeDefnPubSubType::delete_data( } bool PlainMapSTypeDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1444,7 +1444,7 @@ bool PlainMapSTypeDefnPubSubType::compute_key( bool PlainMapSTypeDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1468,14 +1468,14 @@ bool PlainMapSTypeDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1509,18 +1509,18 @@ PlainMapLTypeDefnPubSubType::~PlainMapLTypeDefnPubSubType() bool PlainMapLTypeDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PlainMapLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1539,12 +1539,12 @@ bool PlainMapLTypeDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PlainMapLTypeDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1553,14 +1553,14 @@ bool PlainMapLTypeDefnPubSubType::deserialize( PlainMapLTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1605,8 +1605,8 @@ void PlainMapLTypeDefnPubSubType::delete_data( } bool PlainMapLTypeDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1625,7 +1625,7 @@ bool PlainMapLTypeDefnPubSubType::compute_key( bool PlainMapLTypeDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1649,14 +1649,14 @@ bool PlainMapLTypeDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1690,18 +1690,18 @@ StronglyConnectedComponentIdPubSubType::~StronglyConnectedComponentIdPubSubType( bool StronglyConnectedComponentIdPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StronglyConnectedComponentId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1720,12 +1720,12 @@ bool StronglyConnectedComponentIdPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StronglyConnectedComponentIdPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1734,14 +1734,14 @@ bool StronglyConnectedComponentIdPubSubType::deserialize( StronglyConnectedComponentId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1786,8 +1786,8 @@ void StronglyConnectedComponentIdPubSubType::delete_data( } bool StronglyConnectedComponentIdPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1806,7 +1806,7 @@ bool StronglyConnectedComponentIdPubSubType::compute_key( bool StronglyConnectedComponentIdPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1830,14 +1830,14 @@ bool StronglyConnectedComponentIdPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1871,18 +1871,18 @@ ExtendedTypeDefnPubSubType::~ExtendedTypeDefnPubSubType() bool ExtendedTypeDefnPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ExtendedTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1901,12 +1901,12 @@ bool ExtendedTypeDefnPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ExtendedTypeDefnPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1915,14 +1915,14 @@ bool ExtendedTypeDefnPubSubType::deserialize( ExtendedTypeDefn* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1967,8 +1967,8 @@ void ExtendedTypeDefnPubSubType::delete_data( } bool ExtendedTypeDefnPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1987,7 +1987,7 @@ bool ExtendedTypeDefnPubSubType::compute_key( bool ExtendedTypeDefnPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2011,14 +2011,14 @@ bool ExtendedTypeDefnPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2052,18 +2052,18 @@ DummyPubSubType::~DummyPubSubType() bool DummyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Dummy* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2082,12 +2082,12 @@ bool DummyPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DummyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2096,14 +2096,14 @@ bool DummyPubSubType::deserialize( Dummy* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2148,8 +2148,8 @@ void DummyPubSubType::delete_data( } bool DummyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2168,7 +2168,7 @@ bool DummyPubSubType::compute_key( bool DummyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2192,14 +2192,14 @@ bool DummyPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2238,18 +2238,18 @@ ExtendedAnnotationParameterValuePubSubType::~ExtendedAnnotationParameterValuePub bool ExtendedAnnotationParameterValuePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ExtendedAnnotationParameterValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2268,12 +2268,12 @@ bool ExtendedAnnotationParameterValuePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ExtendedAnnotationParameterValuePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2282,14 +2282,14 @@ bool ExtendedAnnotationParameterValuePubSubType::deserialize( ExtendedAnnotationParameterValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2334,8 +2334,8 @@ void ExtendedAnnotationParameterValuePubSubType::delete_data( } bool ExtendedAnnotationParameterValuePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2354,7 +2354,7 @@ bool ExtendedAnnotationParameterValuePubSubType::compute_key( bool ExtendedAnnotationParameterValuePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2378,14 +2378,14 @@ bool ExtendedAnnotationParameterValuePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2420,18 +2420,18 @@ AppliedAnnotationParameterPubSubType::~AppliedAnnotationParameterPubSubType() bool AppliedAnnotationParameterPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppliedAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2450,12 +2450,12 @@ bool AppliedAnnotationParameterPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppliedAnnotationParameterPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2464,14 +2464,14 @@ bool AppliedAnnotationParameterPubSubType::deserialize( AppliedAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2516,8 +2516,8 @@ void AppliedAnnotationParameterPubSubType::delete_data( } bool AppliedAnnotationParameterPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2536,7 +2536,7 @@ bool AppliedAnnotationParameterPubSubType::compute_key( bool AppliedAnnotationParameterPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2560,14 +2560,14 @@ bool AppliedAnnotationParameterPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2602,18 +2602,18 @@ AppliedAnnotationPubSubType::~AppliedAnnotationPubSubType() bool AppliedAnnotationPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppliedAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2632,12 +2632,12 @@ bool AppliedAnnotationPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppliedAnnotationPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2646,14 +2646,14 @@ bool AppliedAnnotationPubSubType::deserialize( AppliedAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2698,8 +2698,8 @@ void AppliedAnnotationPubSubType::delete_data( } bool AppliedAnnotationPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2718,7 +2718,7 @@ bool AppliedAnnotationPubSubType::compute_key( bool AppliedAnnotationPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2742,14 +2742,14 @@ bool AppliedAnnotationPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2784,18 +2784,18 @@ AppliedVerbatimAnnotationPubSubType::~AppliedVerbatimAnnotationPubSubType() bool AppliedVerbatimAnnotationPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppliedVerbatimAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2814,12 +2814,12 @@ bool AppliedVerbatimAnnotationPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppliedVerbatimAnnotationPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2828,14 +2828,14 @@ bool AppliedVerbatimAnnotationPubSubType::deserialize( AppliedVerbatimAnnotation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2880,8 +2880,8 @@ void AppliedVerbatimAnnotationPubSubType::delete_data( } bool AppliedVerbatimAnnotationPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2900,7 +2900,7 @@ bool AppliedVerbatimAnnotationPubSubType::compute_key( bool AppliedVerbatimAnnotationPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2924,14 +2924,14 @@ bool AppliedVerbatimAnnotationPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2965,18 +2965,18 @@ AppliedBuiltinMemberAnnotationsPubSubType::~AppliedBuiltinMemberAnnotationsPubSu bool AppliedBuiltinMemberAnnotationsPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppliedBuiltinMemberAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2995,12 +2995,12 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppliedBuiltinMemberAnnotationsPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3009,14 +3009,14 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::deserialize( AppliedBuiltinMemberAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3061,8 +3061,8 @@ void AppliedBuiltinMemberAnnotationsPubSubType::delete_data( } bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3081,7 +3081,7 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3105,14 +3105,14 @@ bool AppliedBuiltinMemberAnnotationsPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3146,18 +3146,18 @@ CommonStructMemberPubSubType::~CommonStructMemberPubSubType() bool CommonStructMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3176,12 +3176,12 @@ bool CommonStructMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonStructMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3190,14 +3190,14 @@ bool CommonStructMemberPubSubType::deserialize( CommonStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3242,8 +3242,8 @@ void CommonStructMemberPubSubType::delete_data( } bool CommonStructMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3262,7 +3262,7 @@ bool CommonStructMemberPubSubType::compute_key( bool CommonStructMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3286,14 +3286,14 @@ bool CommonStructMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3327,18 +3327,18 @@ CompleteMemberDetailPubSubType::~CompleteMemberDetailPubSubType() bool CompleteMemberDetailPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3357,12 +3357,12 @@ bool CompleteMemberDetailPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteMemberDetailPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3371,14 +3371,14 @@ bool CompleteMemberDetailPubSubType::deserialize( CompleteMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3423,8 +3423,8 @@ void CompleteMemberDetailPubSubType::delete_data( } bool CompleteMemberDetailPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3443,7 +3443,7 @@ bool CompleteMemberDetailPubSubType::compute_key( bool CompleteMemberDetailPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3467,14 +3467,14 @@ bool CompleteMemberDetailPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3508,18 +3508,18 @@ MinimalMemberDetailPubSubType::~MinimalMemberDetailPubSubType() bool MinimalMemberDetailPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3538,12 +3538,12 @@ bool MinimalMemberDetailPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalMemberDetailPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3552,14 +3552,14 @@ bool MinimalMemberDetailPubSubType::deserialize( MinimalMemberDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3604,8 +3604,8 @@ void MinimalMemberDetailPubSubType::delete_data( } bool MinimalMemberDetailPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3624,7 +3624,7 @@ bool MinimalMemberDetailPubSubType::compute_key( bool MinimalMemberDetailPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3648,14 +3648,14 @@ bool MinimalMemberDetailPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3689,18 +3689,18 @@ CompleteStructMemberPubSubType::~CompleteStructMemberPubSubType() bool CompleteStructMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3719,12 +3719,12 @@ bool CompleteStructMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteStructMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3733,14 +3733,14 @@ bool CompleteStructMemberPubSubType::deserialize( CompleteStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3785,8 +3785,8 @@ void CompleteStructMemberPubSubType::delete_data( } bool CompleteStructMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3805,7 +3805,7 @@ bool CompleteStructMemberPubSubType::compute_key( bool CompleteStructMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3829,14 +3829,14 @@ bool CompleteStructMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3871,18 +3871,18 @@ MinimalStructMemberPubSubType::~MinimalStructMemberPubSubType() bool MinimalStructMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3901,12 +3901,12 @@ bool MinimalStructMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalStructMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3915,14 +3915,14 @@ bool MinimalStructMemberPubSubType::deserialize( MinimalStructMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3967,8 +3967,8 @@ void MinimalStructMemberPubSubType::delete_data( } bool MinimalStructMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3987,7 +3987,7 @@ bool MinimalStructMemberPubSubType::compute_key( bool MinimalStructMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4011,14 +4011,14 @@ bool MinimalStructMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4053,18 +4053,18 @@ AppliedBuiltinTypeAnnotationsPubSubType::~AppliedBuiltinTypeAnnotationsPubSubTyp bool AppliedBuiltinTypeAnnotationsPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppliedBuiltinTypeAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4083,12 +4083,12 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppliedBuiltinTypeAnnotationsPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4097,14 +4097,14 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::deserialize( AppliedBuiltinTypeAnnotations* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4149,8 +4149,8 @@ void AppliedBuiltinTypeAnnotationsPubSubType::delete_data( } bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4169,7 +4169,7 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4193,14 +4193,14 @@ bool AppliedBuiltinTypeAnnotationsPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4234,18 +4234,18 @@ MinimalTypeDetailPubSubType::~MinimalTypeDetailPubSubType() bool MinimalTypeDetailPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4264,12 +4264,12 @@ bool MinimalTypeDetailPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalTypeDetailPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4278,14 +4278,14 @@ bool MinimalTypeDetailPubSubType::deserialize( MinimalTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4330,8 +4330,8 @@ void MinimalTypeDetailPubSubType::delete_data( } bool MinimalTypeDetailPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4350,7 +4350,7 @@ bool MinimalTypeDetailPubSubType::compute_key( bool MinimalTypeDetailPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4374,14 +4374,14 @@ bool MinimalTypeDetailPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4415,18 +4415,18 @@ CompleteTypeDetailPubSubType::~CompleteTypeDetailPubSubType() bool CompleteTypeDetailPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4445,12 +4445,12 @@ bool CompleteTypeDetailPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteTypeDetailPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4459,14 +4459,14 @@ bool CompleteTypeDetailPubSubType::deserialize( CompleteTypeDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4511,8 +4511,8 @@ void CompleteTypeDetailPubSubType::delete_data( } bool CompleteTypeDetailPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4531,7 +4531,7 @@ bool CompleteTypeDetailPubSubType::compute_key( bool CompleteTypeDetailPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4555,14 +4555,14 @@ bool CompleteTypeDetailPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4596,18 +4596,18 @@ CompleteStructHeaderPubSubType::~CompleteStructHeaderPubSubType() bool CompleteStructHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4626,12 +4626,12 @@ bool CompleteStructHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteStructHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4640,14 +4640,14 @@ bool CompleteStructHeaderPubSubType::deserialize( CompleteStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4692,8 +4692,8 @@ void CompleteStructHeaderPubSubType::delete_data( } bool CompleteStructHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4712,7 +4712,7 @@ bool CompleteStructHeaderPubSubType::compute_key( bool CompleteStructHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4736,14 +4736,14 @@ bool CompleteStructHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4777,18 +4777,18 @@ MinimalStructHeaderPubSubType::~MinimalStructHeaderPubSubType() bool MinimalStructHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4807,12 +4807,12 @@ bool MinimalStructHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalStructHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4821,14 +4821,14 @@ bool MinimalStructHeaderPubSubType::deserialize( MinimalStructHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4873,8 +4873,8 @@ void MinimalStructHeaderPubSubType::delete_data( } bool MinimalStructHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4893,7 +4893,7 @@ bool MinimalStructHeaderPubSubType::compute_key( bool MinimalStructHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4917,14 +4917,14 @@ bool MinimalStructHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4958,18 +4958,18 @@ CompleteStructTypePubSubType::~CompleteStructTypePubSubType() bool CompleteStructTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4988,12 +4988,12 @@ bool CompleteStructTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteStructTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5002,14 +5002,14 @@ bool CompleteStructTypePubSubType::deserialize( CompleteStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5054,8 +5054,8 @@ void CompleteStructTypePubSubType::delete_data( } bool CompleteStructTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5074,7 +5074,7 @@ bool CompleteStructTypePubSubType::compute_key( bool CompleteStructTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5098,14 +5098,14 @@ bool CompleteStructTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5139,18 +5139,18 @@ MinimalStructTypePubSubType::~MinimalStructTypePubSubType() bool MinimalStructTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5169,12 +5169,12 @@ bool MinimalStructTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalStructTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5183,14 +5183,14 @@ bool MinimalStructTypePubSubType::deserialize( MinimalStructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5235,8 +5235,8 @@ void MinimalStructTypePubSubType::delete_data( } bool MinimalStructTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5255,7 +5255,7 @@ bool MinimalStructTypePubSubType::compute_key( bool MinimalStructTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5279,14 +5279,14 @@ bool MinimalStructTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5321,18 +5321,18 @@ CommonUnionMemberPubSubType::~CommonUnionMemberPubSubType() bool CommonUnionMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5351,12 +5351,12 @@ bool CommonUnionMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonUnionMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5365,14 +5365,14 @@ bool CommonUnionMemberPubSubType::deserialize( CommonUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5417,8 +5417,8 @@ void CommonUnionMemberPubSubType::delete_data( } bool CommonUnionMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5437,7 +5437,7 @@ bool CommonUnionMemberPubSubType::compute_key( bool CommonUnionMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5461,14 +5461,14 @@ bool CommonUnionMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5502,18 +5502,18 @@ CompleteUnionMemberPubSubType::~CompleteUnionMemberPubSubType() bool CompleteUnionMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5532,12 +5532,12 @@ bool CompleteUnionMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteUnionMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5546,14 +5546,14 @@ bool CompleteUnionMemberPubSubType::deserialize( CompleteUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5598,8 +5598,8 @@ void CompleteUnionMemberPubSubType::delete_data( } bool CompleteUnionMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5618,7 +5618,7 @@ bool CompleteUnionMemberPubSubType::compute_key( bool CompleteUnionMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5642,14 +5642,14 @@ bool CompleteUnionMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5684,18 +5684,18 @@ MinimalUnionMemberPubSubType::~MinimalUnionMemberPubSubType() bool MinimalUnionMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5714,12 +5714,12 @@ bool MinimalUnionMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalUnionMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5728,14 +5728,14 @@ bool MinimalUnionMemberPubSubType::deserialize( MinimalUnionMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5780,8 +5780,8 @@ void MinimalUnionMemberPubSubType::delete_data( } bool MinimalUnionMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5800,7 +5800,7 @@ bool MinimalUnionMemberPubSubType::compute_key( bool MinimalUnionMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5824,14 +5824,14 @@ bool MinimalUnionMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5866,18 +5866,18 @@ CommonDiscriminatorMemberPubSubType::~CommonDiscriminatorMemberPubSubType() bool CommonDiscriminatorMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5896,12 +5896,12 @@ bool CommonDiscriminatorMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonDiscriminatorMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5910,14 +5910,14 @@ bool CommonDiscriminatorMemberPubSubType::deserialize( CommonDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5962,8 +5962,8 @@ void CommonDiscriminatorMemberPubSubType::delete_data( } bool CommonDiscriminatorMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5982,7 +5982,7 @@ bool CommonDiscriminatorMemberPubSubType::compute_key( bool CommonDiscriminatorMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6006,14 +6006,14 @@ bool CommonDiscriminatorMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6047,18 +6047,18 @@ CompleteDiscriminatorMemberPubSubType::~CompleteDiscriminatorMemberPubSubType() bool CompleteDiscriminatorMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6077,12 +6077,12 @@ bool CompleteDiscriminatorMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteDiscriminatorMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6091,14 +6091,14 @@ bool CompleteDiscriminatorMemberPubSubType::deserialize( CompleteDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6143,8 +6143,8 @@ void CompleteDiscriminatorMemberPubSubType::delete_data( } bool CompleteDiscriminatorMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6163,7 +6163,7 @@ bool CompleteDiscriminatorMemberPubSubType::compute_key( bool CompleteDiscriminatorMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6187,14 +6187,14 @@ bool CompleteDiscriminatorMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6228,18 +6228,18 @@ MinimalDiscriminatorMemberPubSubType::~MinimalDiscriminatorMemberPubSubType() bool MinimalDiscriminatorMemberPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6258,12 +6258,12 @@ bool MinimalDiscriminatorMemberPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalDiscriminatorMemberPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6272,14 +6272,14 @@ bool MinimalDiscriminatorMemberPubSubType::deserialize( MinimalDiscriminatorMember* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6324,8 +6324,8 @@ void MinimalDiscriminatorMemberPubSubType::delete_data( } bool MinimalDiscriminatorMemberPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6344,7 +6344,7 @@ bool MinimalDiscriminatorMemberPubSubType::compute_key( bool MinimalDiscriminatorMemberPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6368,14 +6368,14 @@ bool MinimalDiscriminatorMemberPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6409,18 +6409,18 @@ CompleteUnionHeaderPubSubType::~CompleteUnionHeaderPubSubType() bool CompleteUnionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6439,12 +6439,12 @@ bool CompleteUnionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteUnionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6453,14 +6453,14 @@ bool CompleteUnionHeaderPubSubType::deserialize( CompleteUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6505,8 +6505,8 @@ void CompleteUnionHeaderPubSubType::delete_data( } bool CompleteUnionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6525,7 +6525,7 @@ bool CompleteUnionHeaderPubSubType::compute_key( bool CompleteUnionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6549,14 +6549,14 @@ bool CompleteUnionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6590,18 +6590,18 @@ MinimalUnionHeaderPubSubType::~MinimalUnionHeaderPubSubType() bool MinimalUnionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6620,12 +6620,12 @@ bool MinimalUnionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalUnionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6634,14 +6634,14 @@ bool MinimalUnionHeaderPubSubType::deserialize( MinimalUnionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6686,8 +6686,8 @@ void MinimalUnionHeaderPubSubType::delete_data( } bool MinimalUnionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6706,7 +6706,7 @@ bool MinimalUnionHeaderPubSubType::compute_key( bool MinimalUnionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6730,14 +6730,14 @@ bool MinimalUnionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6771,18 +6771,18 @@ CompleteUnionTypePubSubType::~CompleteUnionTypePubSubType() bool CompleteUnionTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6801,12 +6801,12 @@ bool CompleteUnionTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteUnionTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6815,14 +6815,14 @@ bool CompleteUnionTypePubSubType::deserialize( CompleteUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6867,8 +6867,8 @@ void CompleteUnionTypePubSubType::delete_data( } bool CompleteUnionTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6887,7 +6887,7 @@ bool CompleteUnionTypePubSubType::compute_key( bool CompleteUnionTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6911,14 +6911,14 @@ bool CompleteUnionTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6952,18 +6952,18 @@ MinimalUnionTypePubSubType::~MinimalUnionTypePubSubType() bool MinimalUnionTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6982,12 +6982,12 @@ bool MinimalUnionTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalUnionTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6996,14 +6996,14 @@ bool MinimalUnionTypePubSubType::deserialize( MinimalUnionType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7048,8 +7048,8 @@ void MinimalUnionTypePubSubType::delete_data( } bool MinimalUnionTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7068,7 +7068,7 @@ bool MinimalUnionTypePubSubType::compute_key( bool MinimalUnionTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7092,14 +7092,14 @@ bool MinimalUnionTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7133,18 +7133,18 @@ CommonAnnotationParameterPubSubType::~CommonAnnotationParameterPubSubType() bool CommonAnnotationParameterPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7163,12 +7163,12 @@ bool CommonAnnotationParameterPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonAnnotationParameterPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7177,14 +7177,14 @@ bool CommonAnnotationParameterPubSubType::deserialize( CommonAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7229,8 +7229,8 @@ void CommonAnnotationParameterPubSubType::delete_data( } bool CommonAnnotationParameterPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7249,7 +7249,7 @@ bool CommonAnnotationParameterPubSubType::compute_key( bool CommonAnnotationParameterPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7273,14 +7273,14 @@ bool CommonAnnotationParameterPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7314,18 +7314,18 @@ CompleteAnnotationParameterPubSubType::~CompleteAnnotationParameterPubSubType() bool CompleteAnnotationParameterPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7344,12 +7344,12 @@ bool CompleteAnnotationParameterPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAnnotationParameterPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7358,14 +7358,14 @@ bool CompleteAnnotationParameterPubSubType::deserialize( CompleteAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7410,8 +7410,8 @@ void CompleteAnnotationParameterPubSubType::delete_data( } bool CompleteAnnotationParameterPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7430,7 +7430,7 @@ bool CompleteAnnotationParameterPubSubType::compute_key( bool CompleteAnnotationParameterPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7454,14 +7454,14 @@ bool CompleteAnnotationParameterPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7496,18 +7496,18 @@ MinimalAnnotationParameterPubSubType::~MinimalAnnotationParameterPubSubType() bool MinimalAnnotationParameterPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7526,12 +7526,12 @@ bool MinimalAnnotationParameterPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAnnotationParameterPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7540,14 +7540,14 @@ bool MinimalAnnotationParameterPubSubType::deserialize( MinimalAnnotationParameter* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7592,8 +7592,8 @@ void MinimalAnnotationParameterPubSubType::delete_data( } bool MinimalAnnotationParameterPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7612,7 +7612,7 @@ bool MinimalAnnotationParameterPubSubType::compute_key( bool MinimalAnnotationParameterPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7636,14 +7636,14 @@ bool MinimalAnnotationParameterPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7678,18 +7678,18 @@ CompleteAnnotationHeaderPubSubType::~CompleteAnnotationHeaderPubSubType() bool CompleteAnnotationHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7708,12 +7708,12 @@ bool CompleteAnnotationHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAnnotationHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7722,14 +7722,14 @@ bool CompleteAnnotationHeaderPubSubType::deserialize( CompleteAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7774,8 +7774,8 @@ void CompleteAnnotationHeaderPubSubType::delete_data( } bool CompleteAnnotationHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7794,7 +7794,7 @@ bool CompleteAnnotationHeaderPubSubType::compute_key( bool CompleteAnnotationHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7818,14 +7818,14 @@ bool CompleteAnnotationHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7859,18 +7859,18 @@ MinimalAnnotationHeaderPubSubType::~MinimalAnnotationHeaderPubSubType() bool MinimalAnnotationHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7889,12 +7889,12 @@ bool MinimalAnnotationHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAnnotationHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7903,14 +7903,14 @@ bool MinimalAnnotationHeaderPubSubType::deserialize( MinimalAnnotationHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7955,8 +7955,8 @@ void MinimalAnnotationHeaderPubSubType::delete_data( } bool MinimalAnnotationHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7975,7 +7975,7 @@ bool MinimalAnnotationHeaderPubSubType::compute_key( bool MinimalAnnotationHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7999,14 +7999,14 @@ bool MinimalAnnotationHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8040,18 +8040,18 @@ CompleteAnnotationTypePubSubType::~CompleteAnnotationTypePubSubType() bool CompleteAnnotationTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8070,12 +8070,12 @@ bool CompleteAnnotationTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAnnotationTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8084,14 +8084,14 @@ bool CompleteAnnotationTypePubSubType::deserialize( CompleteAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8136,8 +8136,8 @@ void CompleteAnnotationTypePubSubType::delete_data( } bool CompleteAnnotationTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8156,7 +8156,7 @@ bool CompleteAnnotationTypePubSubType::compute_key( bool CompleteAnnotationTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8180,14 +8180,14 @@ bool CompleteAnnotationTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8221,18 +8221,18 @@ MinimalAnnotationTypePubSubType::~MinimalAnnotationTypePubSubType() bool MinimalAnnotationTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8251,12 +8251,12 @@ bool MinimalAnnotationTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAnnotationTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8265,14 +8265,14 @@ bool MinimalAnnotationTypePubSubType::deserialize( MinimalAnnotationType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8317,8 +8317,8 @@ void MinimalAnnotationTypePubSubType::delete_data( } bool MinimalAnnotationTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8337,7 +8337,7 @@ bool MinimalAnnotationTypePubSubType::compute_key( bool MinimalAnnotationTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8361,14 +8361,14 @@ bool MinimalAnnotationTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8402,18 +8402,18 @@ CommonAliasBodyPubSubType::~CommonAliasBodyPubSubType() bool CommonAliasBodyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8432,12 +8432,12 @@ bool CommonAliasBodyPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonAliasBodyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8446,14 +8446,14 @@ bool CommonAliasBodyPubSubType::deserialize( CommonAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8498,8 +8498,8 @@ void CommonAliasBodyPubSubType::delete_data( } bool CommonAliasBodyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8518,7 +8518,7 @@ bool CommonAliasBodyPubSubType::compute_key( bool CommonAliasBodyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8542,14 +8542,14 @@ bool CommonAliasBodyPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8583,18 +8583,18 @@ CompleteAliasBodyPubSubType::~CompleteAliasBodyPubSubType() bool CompleteAliasBodyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8613,12 +8613,12 @@ bool CompleteAliasBodyPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAliasBodyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8627,14 +8627,14 @@ bool CompleteAliasBodyPubSubType::deserialize( CompleteAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8679,8 +8679,8 @@ void CompleteAliasBodyPubSubType::delete_data( } bool CompleteAliasBodyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8699,7 +8699,7 @@ bool CompleteAliasBodyPubSubType::compute_key( bool CompleteAliasBodyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8723,14 +8723,14 @@ bool CompleteAliasBodyPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8764,18 +8764,18 @@ MinimalAliasBodyPubSubType::~MinimalAliasBodyPubSubType() bool MinimalAliasBodyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8794,12 +8794,12 @@ bool MinimalAliasBodyPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAliasBodyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8808,14 +8808,14 @@ bool MinimalAliasBodyPubSubType::deserialize( MinimalAliasBody* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8860,8 +8860,8 @@ void MinimalAliasBodyPubSubType::delete_data( } bool MinimalAliasBodyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8880,7 +8880,7 @@ bool MinimalAliasBodyPubSubType::compute_key( bool MinimalAliasBodyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8904,14 +8904,14 @@ bool MinimalAliasBodyPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8945,18 +8945,18 @@ CompleteAliasHeaderPubSubType::~CompleteAliasHeaderPubSubType() bool CompleteAliasHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8975,12 +8975,12 @@ bool CompleteAliasHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAliasHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8989,14 +8989,14 @@ bool CompleteAliasHeaderPubSubType::deserialize( CompleteAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9041,8 +9041,8 @@ void CompleteAliasHeaderPubSubType::delete_data( } bool CompleteAliasHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9061,7 +9061,7 @@ bool CompleteAliasHeaderPubSubType::compute_key( bool CompleteAliasHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9085,14 +9085,14 @@ bool CompleteAliasHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9126,18 +9126,18 @@ MinimalAliasHeaderPubSubType::~MinimalAliasHeaderPubSubType() bool MinimalAliasHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9156,12 +9156,12 @@ bool MinimalAliasHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAliasHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9170,14 +9170,14 @@ bool MinimalAliasHeaderPubSubType::deserialize( MinimalAliasHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9222,8 +9222,8 @@ void MinimalAliasHeaderPubSubType::delete_data( } bool MinimalAliasHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9242,7 +9242,7 @@ bool MinimalAliasHeaderPubSubType::compute_key( bool MinimalAliasHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9266,14 +9266,14 @@ bool MinimalAliasHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9307,18 +9307,18 @@ CompleteAliasTypePubSubType::~CompleteAliasTypePubSubType() bool CompleteAliasTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9337,12 +9337,12 @@ bool CompleteAliasTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteAliasTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9351,14 +9351,14 @@ bool CompleteAliasTypePubSubType::deserialize( CompleteAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9403,8 +9403,8 @@ void CompleteAliasTypePubSubType::delete_data( } bool CompleteAliasTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9423,7 +9423,7 @@ bool CompleteAliasTypePubSubType::compute_key( bool CompleteAliasTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9447,14 +9447,14 @@ bool CompleteAliasTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9488,18 +9488,18 @@ MinimalAliasTypePubSubType::~MinimalAliasTypePubSubType() bool MinimalAliasTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9518,12 +9518,12 @@ bool MinimalAliasTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalAliasTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9532,14 +9532,14 @@ bool MinimalAliasTypePubSubType::deserialize( MinimalAliasType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9584,8 +9584,8 @@ void MinimalAliasTypePubSubType::delete_data( } bool MinimalAliasTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9604,7 +9604,7 @@ bool MinimalAliasTypePubSubType::compute_key( bool MinimalAliasTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9628,14 +9628,14 @@ bool MinimalAliasTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9669,18 +9669,18 @@ CompleteElementDetailPubSubType::~CompleteElementDetailPubSubType() bool CompleteElementDetailPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteElementDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9699,12 +9699,12 @@ bool CompleteElementDetailPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteElementDetailPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9713,14 +9713,14 @@ bool CompleteElementDetailPubSubType::deserialize( CompleteElementDetail* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9765,8 +9765,8 @@ void CompleteElementDetailPubSubType::delete_data( } bool CompleteElementDetailPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9785,7 +9785,7 @@ bool CompleteElementDetailPubSubType::compute_key( bool CompleteElementDetailPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9809,14 +9809,14 @@ bool CompleteElementDetailPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9850,18 +9850,18 @@ CommonCollectionElementPubSubType::~CommonCollectionElementPubSubType() bool CommonCollectionElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9880,12 +9880,12 @@ bool CommonCollectionElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonCollectionElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9894,14 +9894,14 @@ bool CommonCollectionElementPubSubType::deserialize( CommonCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9946,8 +9946,8 @@ void CommonCollectionElementPubSubType::delete_data( } bool CommonCollectionElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9966,7 +9966,7 @@ bool CommonCollectionElementPubSubType::compute_key( bool CommonCollectionElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9990,14 +9990,14 @@ bool CommonCollectionElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10031,18 +10031,18 @@ CompleteCollectionElementPubSubType::~CompleteCollectionElementPubSubType() bool CompleteCollectionElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10061,12 +10061,12 @@ bool CompleteCollectionElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteCollectionElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10075,14 +10075,14 @@ bool CompleteCollectionElementPubSubType::deserialize( CompleteCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10127,8 +10127,8 @@ void CompleteCollectionElementPubSubType::delete_data( } bool CompleteCollectionElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10147,7 +10147,7 @@ bool CompleteCollectionElementPubSubType::compute_key( bool CompleteCollectionElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10171,14 +10171,14 @@ bool CompleteCollectionElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10212,18 +10212,18 @@ MinimalCollectionElementPubSubType::~MinimalCollectionElementPubSubType() bool MinimalCollectionElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10242,12 +10242,12 @@ bool MinimalCollectionElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalCollectionElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10256,14 +10256,14 @@ bool MinimalCollectionElementPubSubType::deserialize( MinimalCollectionElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10308,8 +10308,8 @@ void MinimalCollectionElementPubSubType::delete_data( } bool MinimalCollectionElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10328,7 +10328,7 @@ bool MinimalCollectionElementPubSubType::compute_key( bool MinimalCollectionElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10352,14 +10352,14 @@ bool MinimalCollectionElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10393,18 +10393,18 @@ CommonCollectionHeaderPubSubType::~CommonCollectionHeaderPubSubType() bool CommonCollectionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10423,12 +10423,12 @@ bool CommonCollectionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonCollectionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10437,14 +10437,14 @@ bool CommonCollectionHeaderPubSubType::deserialize( CommonCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10489,8 +10489,8 @@ void CommonCollectionHeaderPubSubType::delete_data( } bool CommonCollectionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10509,7 +10509,7 @@ bool CommonCollectionHeaderPubSubType::compute_key( bool CommonCollectionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10533,14 +10533,14 @@ bool CommonCollectionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10574,18 +10574,18 @@ CompleteCollectionHeaderPubSubType::~CompleteCollectionHeaderPubSubType() bool CompleteCollectionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10604,12 +10604,12 @@ bool CompleteCollectionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteCollectionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10618,14 +10618,14 @@ bool CompleteCollectionHeaderPubSubType::deserialize( CompleteCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10670,8 +10670,8 @@ void CompleteCollectionHeaderPubSubType::delete_data( } bool CompleteCollectionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10690,7 +10690,7 @@ bool CompleteCollectionHeaderPubSubType::compute_key( bool CompleteCollectionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10714,14 +10714,14 @@ bool CompleteCollectionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10755,18 +10755,18 @@ MinimalCollectionHeaderPubSubType::~MinimalCollectionHeaderPubSubType() bool MinimalCollectionHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10785,12 +10785,12 @@ bool MinimalCollectionHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalCollectionHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10799,14 +10799,14 @@ bool MinimalCollectionHeaderPubSubType::deserialize( MinimalCollectionHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10851,8 +10851,8 @@ void MinimalCollectionHeaderPubSubType::delete_data( } bool MinimalCollectionHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10871,7 +10871,7 @@ bool MinimalCollectionHeaderPubSubType::compute_key( bool MinimalCollectionHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10895,14 +10895,14 @@ bool MinimalCollectionHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10936,18 +10936,18 @@ CompleteSequenceTypePubSubType::~CompleteSequenceTypePubSubType() bool CompleteSequenceTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10966,12 +10966,12 @@ bool CompleteSequenceTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteSequenceTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10980,14 +10980,14 @@ bool CompleteSequenceTypePubSubType::deserialize( CompleteSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11032,8 +11032,8 @@ void CompleteSequenceTypePubSubType::delete_data( } bool CompleteSequenceTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11052,7 +11052,7 @@ bool CompleteSequenceTypePubSubType::compute_key( bool CompleteSequenceTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11076,14 +11076,14 @@ bool CompleteSequenceTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11117,18 +11117,18 @@ MinimalSequenceTypePubSubType::~MinimalSequenceTypePubSubType() bool MinimalSequenceTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11147,12 +11147,12 @@ bool MinimalSequenceTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalSequenceTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11161,14 +11161,14 @@ bool MinimalSequenceTypePubSubType::deserialize( MinimalSequenceType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11213,8 +11213,8 @@ void MinimalSequenceTypePubSubType::delete_data( } bool MinimalSequenceTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11233,7 +11233,7 @@ bool MinimalSequenceTypePubSubType::compute_key( bool MinimalSequenceTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11257,14 +11257,14 @@ bool MinimalSequenceTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11298,18 +11298,18 @@ CommonArrayHeaderPubSubType::~CommonArrayHeaderPubSubType() bool CommonArrayHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11328,12 +11328,12 @@ bool CommonArrayHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonArrayHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11342,14 +11342,14 @@ bool CommonArrayHeaderPubSubType::deserialize( CommonArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11394,8 +11394,8 @@ void CommonArrayHeaderPubSubType::delete_data( } bool CommonArrayHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11414,7 +11414,7 @@ bool CommonArrayHeaderPubSubType::compute_key( bool CommonArrayHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11438,14 +11438,14 @@ bool CommonArrayHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11479,18 +11479,18 @@ CompleteArrayHeaderPubSubType::~CompleteArrayHeaderPubSubType() bool CompleteArrayHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11509,12 +11509,12 @@ bool CompleteArrayHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteArrayHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11523,14 +11523,14 @@ bool CompleteArrayHeaderPubSubType::deserialize( CompleteArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11575,8 +11575,8 @@ void CompleteArrayHeaderPubSubType::delete_data( } bool CompleteArrayHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11595,7 +11595,7 @@ bool CompleteArrayHeaderPubSubType::compute_key( bool CompleteArrayHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11619,14 +11619,14 @@ bool CompleteArrayHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11660,18 +11660,18 @@ MinimalArrayHeaderPubSubType::~MinimalArrayHeaderPubSubType() bool MinimalArrayHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11690,12 +11690,12 @@ bool MinimalArrayHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalArrayHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11704,14 +11704,14 @@ bool MinimalArrayHeaderPubSubType::deserialize( MinimalArrayHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11756,8 +11756,8 @@ void MinimalArrayHeaderPubSubType::delete_data( } bool MinimalArrayHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11776,7 +11776,7 @@ bool MinimalArrayHeaderPubSubType::compute_key( bool MinimalArrayHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11800,14 +11800,14 @@ bool MinimalArrayHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11841,18 +11841,18 @@ CompleteArrayTypePubSubType::~CompleteArrayTypePubSubType() bool CompleteArrayTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11871,12 +11871,12 @@ bool CompleteArrayTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteArrayTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11885,14 +11885,14 @@ bool CompleteArrayTypePubSubType::deserialize( CompleteArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11937,8 +11937,8 @@ void CompleteArrayTypePubSubType::delete_data( } bool CompleteArrayTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11957,7 +11957,7 @@ bool CompleteArrayTypePubSubType::compute_key( bool CompleteArrayTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11981,14 +11981,14 @@ bool CompleteArrayTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12022,18 +12022,18 @@ MinimalArrayTypePubSubType::~MinimalArrayTypePubSubType() bool MinimalArrayTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12052,12 +12052,12 @@ bool MinimalArrayTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalArrayTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12066,14 +12066,14 @@ bool MinimalArrayTypePubSubType::deserialize( MinimalArrayType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12118,8 +12118,8 @@ void MinimalArrayTypePubSubType::delete_data( } bool MinimalArrayTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12138,7 +12138,7 @@ bool MinimalArrayTypePubSubType::compute_key( bool MinimalArrayTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12162,14 +12162,14 @@ bool MinimalArrayTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12203,18 +12203,18 @@ CompleteMapTypePubSubType::~CompleteMapTypePubSubType() bool CompleteMapTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12233,12 +12233,12 @@ bool CompleteMapTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteMapTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12247,14 +12247,14 @@ bool CompleteMapTypePubSubType::deserialize( CompleteMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12299,8 +12299,8 @@ void CompleteMapTypePubSubType::delete_data( } bool CompleteMapTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12319,7 +12319,7 @@ bool CompleteMapTypePubSubType::compute_key( bool CompleteMapTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12343,14 +12343,14 @@ bool CompleteMapTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12384,18 +12384,18 @@ MinimalMapTypePubSubType::~MinimalMapTypePubSubType() bool MinimalMapTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12414,12 +12414,12 @@ bool MinimalMapTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalMapTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12428,14 +12428,14 @@ bool MinimalMapTypePubSubType::deserialize( MinimalMapType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12480,8 +12480,8 @@ void MinimalMapTypePubSubType::delete_data( } bool MinimalMapTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12500,7 +12500,7 @@ bool MinimalMapTypePubSubType::compute_key( bool MinimalMapTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12524,14 +12524,14 @@ bool MinimalMapTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12566,18 +12566,18 @@ CommonEnumeratedLiteralPubSubType::~CommonEnumeratedLiteralPubSubType() bool CommonEnumeratedLiteralPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12596,12 +12596,12 @@ bool CommonEnumeratedLiteralPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonEnumeratedLiteralPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12610,14 +12610,14 @@ bool CommonEnumeratedLiteralPubSubType::deserialize( CommonEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12662,8 +12662,8 @@ void CommonEnumeratedLiteralPubSubType::delete_data( } bool CommonEnumeratedLiteralPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12682,7 +12682,7 @@ bool CommonEnumeratedLiteralPubSubType::compute_key( bool CommonEnumeratedLiteralPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12706,14 +12706,14 @@ bool CommonEnumeratedLiteralPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12747,18 +12747,18 @@ CompleteEnumeratedLiteralPubSubType::~CompleteEnumeratedLiteralPubSubType() bool CompleteEnumeratedLiteralPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12777,12 +12777,12 @@ bool CompleteEnumeratedLiteralPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteEnumeratedLiteralPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12791,14 +12791,14 @@ bool CompleteEnumeratedLiteralPubSubType::deserialize( CompleteEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12843,8 +12843,8 @@ void CompleteEnumeratedLiteralPubSubType::delete_data( } bool CompleteEnumeratedLiteralPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12863,7 +12863,7 @@ bool CompleteEnumeratedLiteralPubSubType::compute_key( bool CompleteEnumeratedLiteralPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12887,14 +12887,14 @@ bool CompleteEnumeratedLiteralPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12929,18 +12929,18 @@ MinimalEnumeratedLiteralPubSubType::~MinimalEnumeratedLiteralPubSubType() bool MinimalEnumeratedLiteralPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12959,12 +12959,12 @@ bool MinimalEnumeratedLiteralPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalEnumeratedLiteralPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12973,14 +12973,14 @@ bool MinimalEnumeratedLiteralPubSubType::deserialize( MinimalEnumeratedLiteral* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13025,8 +13025,8 @@ void MinimalEnumeratedLiteralPubSubType::delete_data( } bool MinimalEnumeratedLiteralPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13045,7 +13045,7 @@ bool MinimalEnumeratedLiteralPubSubType::compute_key( bool MinimalEnumeratedLiteralPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13069,14 +13069,14 @@ bool MinimalEnumeratedLiteralPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13111,18 +13111,18 @@ CommonEnumeratedHeaderPubSubType::~CommonEnumeratedHeaderPubSubType() bool CommonEnumeratedHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13141,12 +13141,12 @@ bool CommonEnumeratedHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonEnumeratedHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13155,14 +13155,14 @@ bool CommonEnumeratedHeaderPubSubType::deserialize( CommonEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13207,8 +13207,8 @@ void CommonEnumeratedHeaderPubSubType::delete_data( } bool CommonEnumeratedHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13227,7 +13227,7 @@ bool CommonEnumeratedHeaderPubSubType::compute_key( bool CommonEnumeratedHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13251,14 +13251,14 @@ bool CommonEnumeratedHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13292,18 +13292,18 @@ CompleteEnumeratedHeaderPubSubType::~CompleteEnumeratedHeaderPubSubType() bool CompleteEnumeratedHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13322,12 +13322,12 @@ bool CompleteEnumeratedHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteEnumeratedHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13336,14 +13336,14 @@ bool CompleteEnumeratedHeaderPubSubType::deserialize( CompleteEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13388,8 +13388,8 @@ void CompleteEnumeratedHeaderPubSubType::delete_data( } bool CompleteEnumeratedHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13408,7 +13408,7 @@ bool CompleteEnumeratedHeaderPubSubType::compute_key( bool CompleteEnumeratedHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13432,14 +13432,14 @@ bool CompleteEnumeratedHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13473,18 +13473,18 @@ MinimalEnumeratedHeaderPubSubType::~MinimalEnumeratedHeaderPubSubType() bool MinimalEnumeratedHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13503,12 +13503,12 @@ bool MinimalEnumeratedHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalEnumeratedHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13517,14 +13517,14 @@ bool MinimalEnumeratedHeaderPubSubType::deserialize( MinimalEnumeratedHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13569,8 +13569,8 @@ void MinimalEnumeratedHeaderPubSubType::delete_data( } bool MinimalEnumeratedHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13589,7 +13589,7 @@ bool MinimalEnumeratedHeaderPubSubType::compute_key( bool MinimalEnumeratedHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13613,14 +13613,14 @@ bool MinimalEnumeratedHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13654,18 +13654,18 @@ CompleteEnumeratedTypePubSubType::~CompleteEnumeratedTypePubSubType() bool CompleteEnumeratedTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13684,12 +13684,12 @@ bool CompleteEnumeratedTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteEnumeratedTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13698,14 +13698,14 @@ bool CompleteEnumeratedTypePubSubType::deserialize( CompleteEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13750,8 +13750,8 @@ void CompleteEnumeratedTypePubSubType::delete_data( } bool CompleteEnumeratedTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13770,7 +13770,7 @@ bool CompleteEnumeratedTypePubSubType::compute_key( bool CompleteEnumeratedTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13794,14 +13794,14 @@ bool CompleteEnumeratedTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13835,18 +13835,18 @@ MinimalEnumeratedTypePubSubType::~MinimalEnumeratedTypePubSubType() bool MinimalEnumeratedTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13865,12 +13865,12 @@ bool MinimalEnumeratedTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalEnumeratedTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13879,14 +13879,14 @@ bool MinimalEnumeratedTypePubSubType::deserialize( MinimalEnumeratedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13931,8 +13931,8 @@ void MinimalEnumeratedTypePubSubType::delete_data( } bool MinimalEnumeratedTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13951,7 +13951,7 @@ bool MinimalEnumeratedTypePubSubType::compute_key( bool MinimalEnumeratedTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13975,14 +13975,14 @@ bool MinimalEnumeratedTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14016,18 +14016,18 @@ CommonBitflagPubSubType::~CommonBitflagPubSubType() bool CommonBitflagPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14046,12 +14046,12 @@ bool CommonBitflagPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonBitflagPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14060,14 +14060,14 @@ bool CommonBitflagPubSubType::deserialize( CommonBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14112,8 +14112,8 @@ void CommonBitflagPubSubType::delete_data( } bool CommonBitflagPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14132,7 +14132,7 @@ bool CommonBitflagPubSubType::compute_key( bool CommonBitflagPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14156,14 +14156,14 @@ bool CommonBitflagPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14197,18 +14197,18 @@ CompleteBitflagPubSubType::~CompleteBitflagPubSubType() bool CompleteBitflagPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14227,12 +14227,12 @@ bool CompleteBitflagPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteBitflagPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14241,14 +14241,14 @@ bool CompleteBitflagPubSubType::deserialize( CompleteBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14293,8 +14293,8 @@ void CompleteBitflagPubSubType::delete_data( } bool CompleteBitflagPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14313,7 +14313,7 @@ bool CompleteBitflagPubSubType::compute_key( bool CompleteBitflagPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14337,14 +14337,14 @@ bool CompleteBitflagPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14379,18 +14379,18 @@ MinimalBitflagPubSubType::~MinimalBitflagPubSubType() bool MinimalBitflagPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14409,12 +14409,12 @@ bool MinimalBitflagPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalBitflagPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14423,14 +14423,14 @@ bool MinimalBitflagPubSubType::deserialize( MinimalBitflag* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14475,8 +14475,8 @@ void MinimalBitflagPubSubType::delete_data( } bool MinimalBitflagPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14495,7 +14495,7 @@ bool MinimalBitflagPubSubType::compute_key( bool MinimalBitflagPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14519,14 +14519,14 @@ bool MinimalBitflagPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14561,18 +14561,18 @@ CommonBitmaskHeaderPubSubType::~CommonBitmaskHeaderPubSubType() bool CommonBitmaskHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonBitmaskHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14591,12 +14591,12 @@ bool CommonBitmaskHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonBitmaskHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14605,14 +14605,14 @@ bool CommonBitmaskHeaderPubSubType::deserialize( CommonBitmaskHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14657,8 +14657,8 @@ void CommonBitmaskHeaderPubSubType::delete_data( } bool CommonBitmaskHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14677,7 +14677,7 @@ bool CommonBitmaskHeaderPubSubType::compute_key( bool CommonBitmaskHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14701,14 +14701,14 @@ bool CommonBitmaskHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14744,18 +14744,18 @@ CompleteBitmaskTypePubSubType::~CompleteBitmaskTypePubSubType() bool CompleteBitmaskTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14774,12 +14774,12 @@ bool CompleteBitmaskTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteBitmaskTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14788,14 +14788,14 @@ bool CompleteBitmaskTypePubSubType::deserialize( CompleteBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14840,8 +14840,8 @@ void CompleteBitmaskTypePubSubType::delete_data( } bool CompleteBitmaskTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14860,7 +14860,7 @@ bool CompleteBitmaskTypePubSubType::compute_key( bool CompleteBitmaskTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14884,14 +14884,14 @@ bool CompleteBitmaskTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14925,18 +14925,18 @@ MinimalBitmaskTypePubSubType::~MinimalBitmaskTypePubSubType() bool MinimalBitmaskTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14955,12 +14955,12 @@ bool MinimalBitmaskTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalBitmaskTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14969,14 +14969,14 @@ bool MinimalBitmaskTypePubSubType::deserialize( MinimalBitmaskType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15021,8 +15021,8 @@ void MinimalBitmaskTypePubSubType::delete_data( } bool MinimalBitmaskTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15041,7 +15041,7 @@ bool MinimalBitmaskTypePubSubType::compute_key( bool MinimalBitmaskTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15065,14 +15065,14 @@ bool MinimalBitmaskTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15106,18 +15106,18 @@ CommonBitfieldPubSubType::~CommonBitfieldPubSubType() bool CommonBitfieldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CommonBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15136,12 +15136,12 @@ bool CommonBitfieldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CommonBitfieldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15150,14 +15150,14 @@ bool CommonBitfieldPubSubType::deserialize( CommonBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15202,8 +15202,8 @@ void CommonBitfieldPubSubType::delete_data( } bool CommonBitfieldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15222,7 +15222,7 @@ bool CommonBitfieldPubSubType::compute_key( bool CommonBitfieldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15246,14 +15246,14 @@ bool CommonBitfieldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15287,18 +15287,18 @@ CompleteBitfieldPubSubType::~CompleteBitfieldPubSubType() bool CompleteBitfieldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15317,12 +15317,12 @@ bool CompleteBitfieldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteBitfieldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15331,14 +15331,14 @@ bool CompleteBitfieldPubSubType::deserialize( CompleteBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15383,8 +15383,8 @@ void CompleteBitfieldPubSubType::delete_data( } bool CompleteBitfieldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15403,7 +15403,7 @@ bool CompleteBitfieldPubSubType::compute_key( bool CompleteBitfieldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15427,14 +15427,14 @@ bool CompleteBitfieldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15469,18 +15469,18 @@ MinimalBitfieldPubSubType::~MinimalBitfieldPubSubType() bool MinimalBitfieldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15499,12 +15499,12 @@ bool MinimalBitfieldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalBitfieldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15513,14 +15513,14 @@ bool MinimalBitfieldPubSubType::deserialize( MinimalBitfield* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15565,8 +15565,8 @@ void MinimalBitfieldPubSubType::delete_data( } bool MinimalBitfieldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15585,7 +15585,7 @@ bool MinimalBitfieldPubSubType::compute_key( bool MinimalBitfieldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15609,14 +15609,14 @@ bool MinimalBitfieldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15651,18 +15651,18 @@ CompleteBitsetHeaderPubSubType::~CompleteBitsetHeaderPubSubType() bool CompleteBitsetHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15681,12 +15681,12 @@ bool CompleteBitsetHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteBitsetHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15695,14 +15695,14 @@ bool CompleteBitsetHeaderPubSubType::deserialize( CompleteBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15747,8 +15747,8 @@ void CompleteBitsetHeaderPubSubType::delete_data( } bool CompleteBitsetHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15767,7 +15767,7 @@ bool CompleteBitsetHeaderPubSubType::compute_key( bool CompleteBitsetHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15791,14 +15791,14 @@ bool CompleteBitsetHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15832,18 +15832,18 @@ MinimalBitsetHeaderPubSubType::~MinimalBitsetHeaderPubSubType() bool MinimalBitsetHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15862,12 +15862,12 @@ bool MinimalBitsetHeaderPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalBitsetHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15876,14 +15876,14 @@ bool MinimalBitsetHeaderPubSubType::deserialize( MinimalBitsetHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15928,8 +15928,8 @@ void MinimalBitsetHeaderPubSubType::delete_data( } bool MinimalBitsetHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15948,7 +15948,7 @@ bool MinimalBitsetHeaderPubSubType::compute_key( bool MinimalBitsetHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15972,14 +15972,14 @@ bool MinimalBitsetHeaderPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16013,18 +16013,18 @@ CompleteBitsetTypePubSubType::~CompleteBitsetTypePubSubType() bool CompleteBitsetTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16043,12 +16043,12 @@ bool CompleteBitsetTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteBitsetTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16057,14 +16057,14 @@ bool CompleteBitsetTypePubSubType::deserialize( CompleteBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16109,8 +16109,8 @@ void CompleteBitsetTypePubSubType::delete_data( } bool CompleteBitsetTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16129,7 +16129,7 @@ bool CompleteBitsetTypePubSubType::compute_key( bool CompleteBitsetTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16153,14 +16153,14 @@ bool CompleteBitsetTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16194,18 +16194,18 @@ MinimalBitsetTypePubSubType::~MinimalBitsetTypePubSubType() bool MinimalBitsetTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16224,12 +16224,12 @@ bool MinimalBitsetTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalBitsetTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16238,14 +16238,14 @@ bool MinimalBitsetTypePubSubType::deserialize( MinimalBitsetType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16290,8 +16290,8 @@ void MinimalBitsetTypePubSubType::delete_data( } bool MinimalBitsetTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16310,7 +16310,7 @@ bool MinimalBitsetTypePubSubType::compute_key( bool MinimalBitsetTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16334,14 +16334,14 @@ bool MinimalBitsetTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16375,18 +16375,18 @@ CompleteExtendedTypePubSubType::~CompleteExtendedTypePubSubType() bool CompleteExtendedTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CompleteExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -16405,12 +16405,12 @@ bool CompleteExtendedTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CompleteExtendedTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16419,14 +16419,14 @@ bool CompleteExtendedTypePubSubType::deserialize( CompleteExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16471,8 +16471,8 @@ void CompleteExtendedTypePubSubType::delete_data( } bool CompleteExtendedTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16491,7 +16491,7 @@ bool CompleteExtendedTypePubSubType::compute_key( bool CompleteExtendedTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16515,14 +16515,14 @@ bool CompleteExtendedTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16557,18 +16557,18 @@ MinimalExtendedTypePubSubType::~MinimalExtendedTypePubSubType() bool MinimalExtendedTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MinimalExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -16587,12 +16587,12 @@ bool MinimalExtendedTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MinimalExtendedTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16601,14 +16601,14 @@ bool MinimalExtendedTypePubSubType::deserialize( MinimalExtendedType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16653,8 +16653,8 @@ void MinimalExtendedTypePubSubType::delete_data( } bool MinimalExtendedTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16673,7 +16673,7 @@ bool MinimalExtendedTypePubSubType::compute_key( bool MinimalExtendedTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16697,14 +16697,14 @@ bool MinimalExtendedTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16742,18 +16742,18 @@ TypeIdentifierTypeObjectPairPubSubType::~TypeIdentifierTypeObjectPairPubSubType( bool TypeIdentifierTypeObjectPairPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeIdentifierTypeObjectPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16772,12 +16772,12 @@ bool TypeIdentifierTypeObjectPairPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeIdentifierTypeObjectPairPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16786,14 +16786,14 @@ bool TypeIdentifierTypeObjectPairPubSubType::deserialize( TypeIdentifierTypeObjectPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16838,8 +16838,8 @@ void TypeIdentifierTypeObjectPairPubSubType::delete_data( } bool TypeIdentifierTypeObjectPairPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16858,7 +16858,7 @@ bool TypeIdentifierTypeObjectPairPubSubType::compute_key( bool TypeIdentifierTypeObjectPairPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16882,14 +16882,14 @@ bool TypeIdentifierTypeObjectPairPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16924,18 +16924,18 @@ TypeIdentifierPairPubSubType::~TypeIdentifierPairPubSubType() bool TypeIdentifierPairPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeIdentifierPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16954,12 +16954,12 @@ bool TypeIdentifierPairPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeIdentifierPairPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16968,14 +16968,14 @@ bool TypeIdentifierPairPubSubType::deserialize( TypeIdentifierPair* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17020,8 +17020,8 @@ void TypeIdentifierPairPubSubType::delete_data( } bool TypeIdentifierPairPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17040,7 +17040,7 @@ bool TypeIdentifierPairPubSubType::compute_key( bool TypeIdentifierPairPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17064,14 +17064,14 @@ bool TypeIdentifierPairPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17106,18 +17106,18 @@ TypeIdentfierWithSizePubSubType::~TypeIdentfierWithSizePubSubType() bool TypeIdentfierWithSizePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeIdentfierWithSize* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17136,12 +17136,12 @@ bool TypeIdentfierWithSizePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeIdentfierWithSizePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17150,14 +17150,14 @@ bool TypeIdentfierWithSizePubSubType::deserialize( TypeIdentfierWithSize* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17202,8 +17202,8 @@ void TypeIdentfierWithSizePubSubType::delete_data( } bool TypeIdentfierWithSizePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17222,7 +17222,7 @@ bool TypeIdentfierWithSizePubSubType::compute_key( bool TypeIdentfierWithSizePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17246,14 +17246,14 @@ bool TypeIdentfierWithSizePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17288,18 +17288,18 @@ TypeIdentifierWithDependenciesPubSubType::~TypeIdentifierWithDependenciesPubSubT bool TypeIdentifierWithDependenciesPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeIdentifierWithDependencies* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17318,12 +17318,12 @@ bool TypeIdentifierWithDependenciesPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeIdentifierWithDependenciesPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17332,14 +17332,14 @@ bool TypeIdentifierWithDependenciesPubSubType::deserialize( TypeIdentifierWithDependencies* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17384,8 +17384,8 @@ void TypeIdentifierWithDependenciesPubSubType::delete_data( } bool TypeIdentifierWithDependenciesPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17404,7 +17404,7 @@ bool TypeIdentifierWithDependenciesPubSubType::compute_key( bool TypeIdentifierWithDependenciesPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17428,14 +17428,14 @@ bool TypeIdentifierWithDependenciesPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17470,18 +17470,18 @@ TypeInformationPubSubType::~TypeInformationPubSubType() bool TypeInformationPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TypeInformation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -17500,12 +17500,12 @@ bool TypeInformationPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TypeInformationPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17514,14 +17514,14 @@ bool TypeInformationPubSubType::deserialize( TypeInformation* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17566,8 +17566,8 @@ void TypeInformationPubSubType::delete_data( } bool TypeInformationPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17586,7 +17586,7 @@ bool TypeInformationPubSubType::compute_key( bool TypeInformationPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17610,14 +17610,14 @@ bool TypeInformationPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp index 7554573bf32..b77afbe374b 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp @@ -374,7 +374,7 @@ bool MonitorService::add_change( const bool& disposed) { InstanceHandle_t handle; - type_.compute_key(&status_data, &handle, false); + type_.compute_key(&status_data, handle, false); CacheChange_t* change = status_writer_history_->create_change( (disposed ? fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED : fastdds::rtps::ALIVE), @@ -393,7 +393,7 @@ bool MonitorService::add_change( { CDRMessage_t aux_msg(change->serializedPayload); - if (!type_.serialize(&status_data, &change->serializedPayload, fastdds::dds::DEFAULT_DATA_REPRESENTATION)) + if (!type_.serialize(&status_data, change->serializedPayload, fastdds::dds::DEFAULT_DATA_REPRESENTATION)) { EPROSIMA_LOG_ERROR(MONITOR_SERVICE, "Serialization failed"); status_writer_history_->release_change(change); diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx index 08de7809da7..7918dca6ede 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -56,18 +56,18 @@ namespace eprosima { bool ConnectionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -86,12 +86,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ConnectionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -100,14 +100,14 @@ namespace eprosima { Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -152,8 +152,8 @@ namespace eprosima { } bool ConnectionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -172,7 +172,7 @@ namespace eprosima { bool ConnectionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -196,14 +196,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -236,18 +236,18 @@ namespace eprosima { bool QosPolicyCount_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -266,12 +266,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool QosPolicyCount_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -280,14 +280,14 @@ namespace eprosima { QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -332,8 +332,8 @@ namespace eprosima { } bool QosPolicyCount_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -352,7 +352,7 @@ namespace eprosima { bool QosPolicyCount_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -376,14 +376,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -416,18 +416,18 @@ namespace eprosima { bool BaseStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -446,12 +446,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BaseStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -460,14 +460,14 @@ namespace eprosima { BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -512,8 +512,8 @@ namespace eprosima { } bool BaseStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -532,7 +532,7 @@ namespace eprosima { bool BaseStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -556,14 +556,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -597,18 +597,18 @@ namespace eprosima { bool IncompatibleQoSStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -627,12 +627,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool IncompatibleQoSStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -641,14 +641,14 @@ namespace eprosima { IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -693,8 +693,8 @@ namespace eprosima { } bool IncompatibleQoSStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -713,7 +713,7 @@ namespace eprosima { bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -737,14 +737,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -777,18 +777,18 @@ namespace eprosima { bool LivelinessChangedStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -807,12 +807,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LivelinessChangedStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -821,14 +821,14 @@ namespace eprosima { LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -873,8 +873,8 @@ namespace eprosima { } bool LivelinessChangedStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -893,7 +893,7 @@ namespace eprosima { bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -917,14 +917,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -957,18 +957,18 @@ namespace eprosima { bool DeadlineMissedStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -987,12 +987,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DeadlineMissedStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1001,14 +1001,14 @@ namespace eprosima { DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1053,8 +1053,8 @@ namespace eprosima { } bool DeadlineMissedStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1073,7 +1073,7 @@ namespace eprosima { bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1097,14 +1097,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1144,18 +1144,18 @@ namespace eprosima { bool MonitorServiceStatusDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1174,12 +1174,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MonitorServiceStatusDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1188,14 +1188,14 @@ namespace eprosima { MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1240,8 +1240,8 @@ namespace eprosima { } bool MonitorServiceStatusDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1260,7 +1260,7 @@ namespace eprosima { bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1284,14 +1284,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index a8e3e725d53..7938c6eaa10 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -61,11 +61,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -73,13 +73,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -140,11 +140,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -152,13 +152,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -219,11 +219,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -231,13 +231,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -299,11 +299,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -311,13 +311,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -378,11 +378,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -390,13 +390,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -457,11 +457,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -469,13 +469,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -553,11 +553,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -565,13 +565,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index 971db5a5e61..f2ad0bcbf73 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -57,18 +57,18 @@ namespace eprosima { bool EntityId_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -87,12 +87,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityId_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -101,14 +101,14 @@ namespace eprosima { EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -153,8 +153,8 @@ namespace eprosima { } bool EntityId_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -173,7 +173,7 @@ namespace eprosima { bool EntityId_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -197,14 +197,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -237,18 +237,18 @@ namespace eprosima { bool GuidPrefix_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -267,12 +267,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GuidPrefix_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -281,14 +281,14 @@ namespace eprosima { GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -333,8 +333,8 @@ namespace eprosima { } bool GuidPrefix_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -353,7 +353,7 @@ namespace eprosima { bool GuidPrefix_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -377,14 +377,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -417,18 +417,18 @@ namespace eprosima { bool GUID_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -447,12 +447,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GUID_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -461,14 +461,14 @@ namespace eprosima { GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -513,8 +513,8 @@ namespace eprosima { } bool GUID_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -533,7 +533,7 @@ namespace eprosima { bool GUID_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -557,14 +557,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -597,18 +597,18 @@ namespace eprosima { bool SequenceNumber_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -627,12 +627,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceNumber_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -641,14 +641,14 @@ namespace eprosima { SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -693,8 +693,8 @@ namespace eprosima { } bool SequenceNumber_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -713,7 +713,7 @@ namespace eprosima { bool SequenceNumber_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -737,14 +737,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -777,18 +777,18 @@ namespace eprosima { bool SampleIdentity_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -807,12 +807,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SampleIdentity_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -821,14 +821,14 @@ namespace eprosima { SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -873,8 +873,8 @@ namespace eprosima { } bool SampleIdentity_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -893,7 +893,7 @@ namespace eprosima { bool SampleIdentity_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -917,14 +917,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -957,18 +957,18 @@ namespace eprosima { bool Locator_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -987,12 +987,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Locator_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1001,14 +1001,14 @@ namespace eprosima { Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1053,8 +1053,8 @@ namespace eprosima { } bool Locator_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1073,7 +1073,7 @@ namespace eprosima { bool Locator_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1097,14 +1097,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1139,18 +1139,18 @@ namespace eprosima { bool DiscoveryTimePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1169,12 +1169,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DiscoveryTimePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1183,14 +1183,14 @@ namespace eprosima { DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1235,8 +1235,8 @@ namespace eprosima { } bool DiscoveryTimePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1255,7 +1255,7 @@ namespace eprosima { bool DiscoveryTimePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1279,14 +1279,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1319,18 +1319,18 @@ namespace eprosima { bool EntityCountPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1349,12 +1349,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityCountPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1363,14 +1363,14 @@ namespace eprosima { EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1415,8 +1415,8 @@ namespace eprosima { } bool EntityCountPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1435,7 +1435,7 @@ namespace eprosima { bool EntityCountPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1459,14 +1459,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1499,18 +1499,18 @@ namespace eprosima { bool SampleIdentityCountPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1529,12 +1529,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SampleIdentityCountPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1543,14 +1543,14 @@ namespace eprosima { SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1595,8 +1595,8 @@ namespace eprosima { } bool SampleIdentityCountPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1615,7 +1615,7 @@ namespace eprosima { bool SampleIdentityCountPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1639,14 +1639,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1679,18 +1679,18 @@ namespace eprosima { bool Entity2LocatorTrafficPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1709,12 +1709,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Entity2LocatorTrafficPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1723,14 +1723,14 @@ namespace eprosima { Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1775,8 +1775,8 @@ namespace eprosima { } bool Entity2LocatorTrafficPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1795,7 +1795,7 @@ namespace eprosima { bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1819,14 +1819,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1859,18 +1859,18 @@ namespace eprosima { bool WriterReaderDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1889,12 +1889,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool WriterReaderDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1903,14 +1903,14 @@ namespace eprosima { WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1955,8 +1955,8 @@ namespace eprosima { } bool WriterReaderDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1975,7 +1975,7 @@ namespace eprosima { bool WriterReaderDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1999,14 +1999,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2039,18 +2039,18 @@ namespace eprosima { bool Locator2LocatorDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2069,12 +2069,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Locator2LocatorDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2083,14 +2083,14 @@ namespace eprosima { Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2135,8 +2135,8 @@ namespace eprosima { } bool Locator2LocatorDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2155,7 +2155,7 @@ namespace eprosima { bool Locator2LocatorDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2179,14 +2179,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2219,18 +2219,18 @@ namespace eprosima { bool EntityDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2249,12 +2249,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2263,14 +2263,14 @@ namespace eprosima { EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2315,8 +2315,8 @@ namespace eprosima { } bool EntityDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2335,7 +2335,7 @@ namespace eprosima { bool EntityDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2359,14 +2359,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2399,18 +2399,18 @@ namespace eprosima { bool PhysicalDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2429,12 +2429,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PhysicalDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2443,14 +2443,14 @@ namespace eprosima { PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2495,8 +2495,8 @@ namespace eprosima { } bool PhysicalDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2515,7 +2515,7 @@ namespace eprosima { bool PhysicalDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2539,14 +2539,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index 2ec904ef7f9..b569c375f9e 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -62,11 +62,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -74,13 +74,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -141,11 +141,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -153,13 +153,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -220,11 +220,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -232,13 +232,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -299,11 +299,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -311,13 +311,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -378,11 +378,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -390,13 +390,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -457,11 +457,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -469,13 +469,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -537,11 +537,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -549,13 +549,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -616,11 +616,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -628,13 +628,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -695,11 +695,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -707,13 +707,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -774,11 +774,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -786,13 +786,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -853,11 +853,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -865,13 +865,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -932,11 +932,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -944,13 +944,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1011,11 +1011,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1023,13 +1023,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1090,11 +1090,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1102,13 +1102,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp b/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp index f7fd4247456..28b480582e3 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp @@ -32,7 +32,7 @@ class MockHelloWorldPubSubType : public HelloWorldPubSubType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation) override { last_data_representation = data_representation; @@ -41,11 +41,11 @@ class MockHelloWorldPubSubType : public HelloWorldPubSubType } bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override { // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index 4c174a2f380..64800b5da76 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -59,14 +59,14 @@ class DDSFindTopicTest : public testing::Test bool serialize( const void* const, - fastdds::rtps::SerializedPayload_t*, + fastdds::rtps::SerializedPayload_t&, fastdds::dds::DataRepresentationId_t) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t*, + fastdds::rtps::SerializedPayload_t&, void*) override { return true; @@ -90,8 +90,8 @@ class DDSFindTopicTest : public testing::Test } bool compute_key( - fastdds::rtps::SerializedPayload_t*, - fastdds::rtps::InstanceHandle_t*, + fastdds::rtps::SerializedPayload_t&, + fastdds::rtps::InstanceHandle_t&, bool) override { return true; @@ -99,7 +99,7 @@ class DDSFindTopicTest : public testing::Test bool compute_key( const void* const, - fastdds::rtps::InstanceHandle_t*, + fastdds::rtps::InstanceHandle_t&, bool) override { return false; diff --git a/test/blackbox/common/DDSBlackboxTestsListeners.cpp b/test/blackbox/common/DDSBlackboxTestsListeners.cpp index 54227839abf..cc5c08837ad 100644 --- a/test/blackbox/common/DDSBlackboxTestsListeners.cpp +++ b/test/blackbox/common/DDSBlackboxTestsListeners.cpp @@ -3087,8 +3087,8 @@ TEST(DDSStatus, keyed_best_effort_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle_odd; eprosima::fastdds::dds::InstanceHandle_t handle_even; - dummy_data->compute_key(&data.front(), &handle_even); - dummy_data->compute_key(&data.back(), &handle_odd); + dummy_data->compute_key(&data.front(), handle_even); + dummy_data->compute_key(&data.back(), handle_odd); reader.startReception(data); writer.send(data); @@ -3218,7 +3218,7 @@ TEST(DDSStatus, keyed_reliable_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle; - dummy_data->compute_key(&data.back(), &handle); + dummy_data->compute_key(&data.back(), handle); reader.startReception(data); // To avoid race condition receiving ACK, wait some time between samples @@ -3401,8 +3401,8 @@ TEST(DDSStatus, keyed_reliable_positive_acks_disabled_on_unack_sample_removed) auto dummy_data = new KeyedHelloWorldPubSubType(); eprosima::fastdds::dds::InstanceHandle_t handle_odd; eprosima::fastdds::dds::InstanceHandle_t handle_even; - dummy_data->compute_key(&data.front(), &handle_even); - dummy_data->compute_key(&data.back(), &handle_odd); + dummy_data->compute_key(&data.front(), handle_even); + dummy_data->compute_key(&data.back(), handle_odd); reader.startReception(data); diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx index 2aec15ef5bf..64eae932097 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.cxx +++ b/test/blackbox/types/Data1mbPubSubTypes.cxx @@ -53,18 +53,18 @@ Data1mbPubSubType::~Data1mbPubSubType() bool Data1mbPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Data1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool Data1mbPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Data1mbPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool Data1mbPubSubType::deserialize( Data1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void Data1mbPubSubType::delete_data( } bool Data1mbPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool Data1mbPubSubType::compute_key( bool Data1mbPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool Data1mbPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index 6bb7f045134..5a1e5348822 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -54,11 +54,11 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx index ae5ddc754f6..020c3cfcd8b 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.cxx +++ b/test/blackbox/types/Data64kbPubSubTypes.cxx @@ -53,18 +53,18 @@ Data64kbPubSubType::~Data64kbPubSubType() bool Data64kbPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Data64kb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool Data64kbPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Data64kbPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool Data64kbPubSubType::deserialize( Data64kb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void Data64kbPubSubType::delete_data( } bool Data64kbPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool Data64kbPubSubType::compute_key( bool Data64kbPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool Data64kbPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index 8adbf865917..5a3e342e799 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -54,11 +54,11 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx index a8e7906b0d4..27e8b1b3e70 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.cxx +++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx @@ -53,18 +53,18 @@ FixedSizedPubSubType::~FixedSizedPubSubType() bool FixedSizedPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixedSized* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool FixedSizedPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixedSizedPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool FixedSizedPubSubType::deserialize( FixedSized* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void FixedSizedPubSubType::delete_data( } bool FixedSizedPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool FixedSizedPubSubType::compute_key( bool FixedSizedPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool FixedSizedPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index 408af23bd90..49b19731357 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -87,11 +87,11 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -99,13 +99,13 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx index cecfd63487f..7d87e77e533 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ HelloWorldPubSubType::~HelloWorldPubSubType() bool HelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool HelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool HelloWorldPubSubType::deserialize( HelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void HelloWorldPubSubType::delete_data( } bool HelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool HelloWorldPubSubType::compute_key( bool HelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool HelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index 52686589b0f..56aac916f19 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx index 1d4b5a8df1f..8a4719cc30f 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx @@ -53,18 +53,18 @@ KeyedData1mbPubSubType::~KeyedData1mbPubSubType() bool KeyedData1mbPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedData1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool KeyedData1mbPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedData1mbPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool KeyedData1mbPubSubType::deserialize( KeyedData1mb* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void KeyedData1mbPubSubType::delete_data( } bool KeyedData1mbPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool KeyedData1mbPubSubType::compute_key( bool KeyedData1mbPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool KeyedData1mbPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index 2a0b4b94d2e..487251a3c5d 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -54,11 +54,11 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx index 9c81f5c91cf..a2723597b50 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ KeyedHelloWorldPubSubType::~KeyedHelloWorldPubSubType() bool KeyedHelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool KeyedHelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedHelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool KeyedHelloWorldPubSubType::deserialize( KeyedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void KeyedHelloWorldPubSubType::delete_data( } bool KeyedHelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool KeyedHelloWorldPubSubType::compute_key( bool KeyedHelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool KeyedHelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index 7c74ba26b38..9ef39bb12b1 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx index e0c8c72dae2..65c2f0b9d7e 100644 --- a/test/blackbox/types/StringTestPubSubTypes.cxx +++ b/test/blackbox/types/StringTestPubSubTypes.cxx @@ -53,18 +53,18 @@ StringTestPubSubType::~StringTestPubSubType() bool StringTestPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StringTest* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool StringTestPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StringTestPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool StringTestPubSubType::deserialize( StringTest* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void StringTestPubSubType::delete_data( } bool StringTestPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool StringTestPubSubType::compute_key( bool StringTestPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool StringTestPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index f1e138a18fb..5ba86b3fd29 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -54,11 +54,11 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx index 45efc843bf3..27930170bab 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx +++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx @@ -53,18 +53,18 @@ TestRegression3361PubSubType::~TestRegression3361PubSubType() bool TestRegression3361PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const TestRegression3361* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool TestRegression3361PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool TestRegression3361PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool TestRegression3361PubSubType::deserialize( TestRegression3361* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void TestRegression3361PubSubType::delete_data( } bool TestRegression3361PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool TestRegression3361PubSubType::compute_key( bool TestRegression3361PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool TestRegression3361PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index 1f16d68caed..d643801da0e 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -55,11 +55,11 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx index dc48151fc82..df87a981ec2 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx @@ -53,18 +53,18 @@ UnboundedHelloWorldPubSubType::~UnboundedHelloWorldPubSubType() bool UnboundedHelloWorldPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnboundedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool UnboundedHelloWorldPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnboundedHelloWorldPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool UnboundedHelloWorldPubSubType::deserialize( UnboundedHelloWorld* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void UnboundedHelloWorldPubSubType::delete_data( } bool UnboundedHelloWorldPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool UnboundedHelloWorldPubSubType::compute_key( bool UnboundedHelloWorldPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool UnboundedHelloWorldPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index 02cdecada32..23beb71e133 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -54,11 +54,11 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/core/core_typesPubSubTypes.cxx b/test/blackbox/types/core/core_typesPubSubTypes.cxx index c224971808d..06dadb79a39 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.cxx +++ b/test/blackbox/types/core/core_typesPubSubTypes.cxx @@ -58,18 +58,18 @@ namespace eprosima { bool EntityId_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -88,12 +88,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityId_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -102,14 +102,14 @@ namespace eprosima { EntityId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -154,8 +154,8 @@ namespace eprosima { } bool EntityId_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -174,7 +174,7 @@ namespace eprosima { bool EntityId_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -198,14 +198,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -238,18 +238,18 @@ namespace eprosima { bool ProtocolVersion_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ProtocolVersion_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -268,12 +268,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ProtocolVersion_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -282,14 +282,14 @@ namespace eprosima { ProtocolVersion_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -334,8 +334,8 @@ namespace eprosima { } bool ProtocolVersion_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -354,7 +354,7 @@ namespace eprosima { bool ProtocolVersion_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -378,14 +378,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -418,18 +418,18 @@ namespace eprosima { bool VendorId_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const VendorId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -448,12 +448,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool VendorId_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -462,14 +462,14 @@ namespace eprosima { VendorId_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -514,8 +514,8 @@ namespace eprosima { } bool VendorId_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -534,7 +534,7 @@ namespace eprosima { bool VendorId_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -558,14 +558,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -598,18 +598,18 @@ namespace eprosima { bool GuidPrefix_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GuidPrefix_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -628,12 +628,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GuidPrefix_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -642,14 +642,14 @@ namespace eprosima { GuidPrefix_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -694,8 +694,8 @@ namespace eprosima { } bool GuidPrefix_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -714,7 +714,7 @@ namespace eprosima { bool GuidPrefix_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -738,14 +738,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -778,18 +778,18 @@ namespace eprosima { bool GUID_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -808,12 +808,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GUID_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -822,14 +822,14 @@ namespace eprosima { GUID_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -874,8 +874,8 @@ namespace eprosima { } bool GUID_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -894,7 +894,7 @@ namespace eprosima { bool GUID_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -918,14 +918,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -958,18 +958,18 @@ namespace eprosima { bool SequenceNumber_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -988,12 +988,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceNumber_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1002,14 +1002,14 @@ namespace eprosima { SequenceNumber_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1054,8 +1054,8 @@ namespace eprosima { } bool SequenceNumber_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1074,7 +1074,7 @@ namespace eprosima { bool SequenceNumber_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1098,14 +1098,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1138,18 +1138,18 @@ namespace eprosima { bool Count_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Count_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1168,12 +1168,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Count_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1182,14 +1182,14 @@ namespace eprosima { Count_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1234,8 +1234,8 @@ namespace eprosima { } bool Count_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1254,7 +1254,7 @@ namespace eprosima { bool Count_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1278,14 +1278,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1318,18 +1318,18 @@ namespace eprosima { bool Time_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Time_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1348,12 +1348,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Time_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1362,14 +1362,14 @@ namespace eprosima { Time_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1414,8 +1414,8 @@ namespace eprosima { } bool Time_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1434,7 +1434,7 @@ namespace eprosima { bool Time_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1458,14 +1458,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1499,18 +1499,18 @@ namespace eprosima { bool SequenceNumberSetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceNumberSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1529,12 +1529,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceNumberSetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1543,14 +1543,14 @@ namespace eprosima { SequenceNumberSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1595,8 +1595,8 @@ namespace eprosima { } bool SequenceNumberSetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1615,7 +1615,7 @@ namespace eprosima { bool SequenceNumberSetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1639,14 +1639,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1679,18 +1679,18 @@ namespace eprosima { bool Locator_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Locator_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1709,12 +1709,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Locator_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1723,14 +1723,14 @@ namespace eprosima { Locator_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1775,8 +1775,8 @@ namespace eprosima { } bool Locator_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1795,7 +1795,7 @@ namespace eprosima { bool Locator_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1819,14 +1819,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1859,18 +1859,18 @@ namespace eprosima { bool Duration_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Duration_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1889,12 +1889,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Duration_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1903,14 +1903,14 @@ namespace eprosima { Duration_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1955,8 +1955,8 @@ namespace eprosima { } bool Duration_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1975,7 +1975,7 @@ namespace eprosima { bool Duration_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1999,14 +1999,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2041,18 +2041,18 @@ namespace eprosima { bool StatusInfo_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StatusInfo_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2071,12 +2071,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StatusInfo_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2085,14 +2085,14 @@ namespace eprosima { StatusInfo_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2137,8 +2137,8 @@ namespace eprosima { } bool StatusInfo_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2157,7 +2157,7 @@ namespace eprosima { bool StatusInfo_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2181,14 +2181,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2221,18 +2221,18 @@ namespace eprosima { bool KeyHash_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyHash_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2251,12 +2251,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyHash_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2265,14 +2265,14 @@ namespace eprosima { KeyHash_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2317,8 +2317,8 @@ namespace eprosima { } bool KeyHash_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2337,7 +2337,7 @@ namespace eprosima { bool KeyHash_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2361,14 +2361,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2401,18 +2401,18 @@ namespace eprosima { bool EntityName_tPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityName_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2431,12 +2431,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityName_tPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2445,14 +2445,14 @@ namespace eprosima { EntityName_t* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2497,8 +2497,8 @@ namespace eprosima { } bool EntityName_tPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2517,7 +2517,7 @@ namespace eprosima { bool EntityName_tPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2541,14 +2541,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2583,18 +2583,18 @@ namespace eprosima { bool HeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Header* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2613,12 +2613,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2627,14 +2627,14 @@ namespace eprosima { Header* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2679,8 +2679,8 @@ namespace eprosima { } bool HeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2699,7 +2699,7 @@ namespace eprosima { bool HeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2723,14 +2723,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2763,18 +2763,18 @@ namespace eprosima { bool SubmessageHeaderPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SubmessageHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2793,12 +2793,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SubmessageHeaderPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2807,14 +2807,14 @@ namespace eprosima { SubmessageHeader* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2859,8 +2859,8 @@ namespace eprosima { } bool SubmessageHeaderPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2879,7 +2879,7 @@ namespace eprosima { bool SubmessageHeaderPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2903,14 +2903,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2946,18 +2946,18 @@ namespace eprosima { bool AckNackSubmessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AckNackSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2976,12 +2976,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AckNackSubmessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2990,14 +2990,14 @@ namespace eprosima { AckNackSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3042,8 +3042,8 @@ namespace eprosima { } bool AckNackSubmessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3062,7 +3062,7 @@ namespace eprosima { bool AckNackSubmessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3086,14 +3086,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3126,18 +3126,18 @@ namespace eprosima { bool HeartBeatSubmessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const HeartBeatSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3156,12 +3156,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool HeartBeatSubmessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3170,14 +3170,14 @@ namespace eprosima { HeartBeatSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3222,8 +3222,8 @@ namespace eprosima { } bool HeartBeatSubmessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3242,7 +3242,7 @@ namespace eprosima { bool HeartBeatSubmessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3266,14 +3266,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3306,18 +3306,18 @@ namespace eprosima { bool InfoDestinationSubmessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InfoDestinationSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3336,12 +3336,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InfoDestinationSubmessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3350,14 +3350,14 @@ namespace eprosima { InfoDestinationSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3402,8 +3402,8 @@ namespace eprosima { } bool InfoDestinationSubmessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3422,7 +3422,7 @@ namespace eprosima { bool InfoDestinationSubmessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3446,14 +3446,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3486,18 +3486,18 @@ namespace eprosima { bool InfoSourceSubmessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InfoSourceSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3516,12 +3516,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InfoSourceSubmessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3530,14 +3530,14 @@ namespace eprosima { InfoSourceSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3582,8 +3582,8 @@ namespace eprosima { } bool InfoSourceSubmessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3602,7 +3602,7 @@ namespace eprosima { bool InfoSourceSubmessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3626,14 +3626,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3666,18 +3666,18 @@ namespace eprosima { bool InfoTimestampSubmessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InfoTimestampSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3696,12 +3696,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InfoTimestampSubmessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3710,14 +3710,14 @@ namespace eprosima { InfoTimestampSubmessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3762,8 +3762,8 @@ namespace eprosima { } bool InfoTimestampSubmessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3782,7 +3782,7 @@ namespace eprosima { bool InfoTimestampSubmessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3806,14 +3806,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3847,18 +3847,18 @@ namespace eprosima { bool RTPSMessagePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const RTPSMessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3877,12 +3877,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool RTPSMessagePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3891,14 +3891,14 @@ namespace eprosima { RTPSMessage* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3943,8 +3943,8 @@ namespace eprosima { } bool RTPSMessagePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3963,7 +3963,7 @@ namespace eprosima { bool RTPSMessagePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3987,14 +3987,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index 52e7099c912..421eed63f4b 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -64,11 +64,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -76,13 +76,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -143,11 +143,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -155,13 +155,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -222,11 +222,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -234,13 +234,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -301,11 +301,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -313,13 +313,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -380,11 +380,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -392,13 +392,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -459,11 +459,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -471,13 +471,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -538,11 +538,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -550,13 +550,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -617,11 +617,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -629,13 +629,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -697,11 +697,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -709,13 +709,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -776,11 +776,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -788,13 +788,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -855,11 +855,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -867,13 +867,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -936,11 +936,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -948,13 +948,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1015,11 +1015,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1027,13 +1027,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1094,11 +1094,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1106,13 +1106,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1174,11 +1174,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1186,13 +1186,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1253,11 +1253,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1265,13 +1265,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1335,11 +1335,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1347,13 +1347,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1414,11 +1414,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1426,13 +1426,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1493,11 +1493,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1505,13 +1505,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1572,11 +1572,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1584,13 +1584,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1651,11 +1651,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1663,13 +1663,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1731,11 +1731,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1743,13 +1743,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx index 08de7809da7..7918dca6ede 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx @@ -56,18 +56,18 @@ namespace eprosima { bool ConnectionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -86,12 +86,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ConnectionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -100,14 +100,14 @@ namespace eprosima { Connection* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -152,8 +152,8 @@ namespace eprosima { } bool ConnectionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -172,7 +172,7 @@ namespace eprosima { bool ConnectionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -196,14 +196,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -236,18 +236,18 @@ namespace eprosima { bool QosPolicyCount_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -266,12 +266,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool QosPolicyCount_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -280,14 +280,14 @@ namespace eprosima { QosPolicyCount_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -332,8 +332,8 @@ namespace eprosima { } bool QosPolicyCount_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -352,7 +352,7 @@ namespace eprosima { bool QosPolicyCount_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -376,14 +376,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -416,18 +416,18 @@ namespace eprosima { bool BaseStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -446,12 +446,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BaseStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -460,14 +460,14 @@ namespace eprosima { BaseStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -512,8 +512,8 @@ namespace eprosima { } bool BaseStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -532,7 +532,7 @@ namespace eprosima { bool BaseStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -556,14 +556,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -597,18 +597,18 @@ namespace eprosima { bool IncompatibleQoSStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -627,12 +627,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool IncompatibleQoSStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -641,14 +641,14 @@ namespace eprosima { IncompatibleQoSStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -693,8 +693,8 @@ namespace eprosima { } bool IncompatibleQoSStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -713,7 +713,7 @@ namespace eprosima { bool IncompatibleQoSStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -737,14 +737,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -777,18 +777,18 @@ namespace eprosima { bool LivelinessChangedStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -807,12 +807,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LivelinessChangedStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -821,14 +821,14 @@ namespace eprosima { LivelinessChangedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -873,8 +873,8 @@ namespace eprosima { } bool LivelinessChangedStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -893,7 +893,7 @@ namespace eprosima { bool LivelinessChangedStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -917,14 +917,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -957,18 +957,18 @@ namespace eprosima { bool DeadlineMissedStatus_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -987,12 +987,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DeadlineMissedStatus_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1001,14 +1001,14 @@ namespace eprosima { DeadlineMissedStatus_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1053,8 +1053,8 @@ namespace eprosima { } bool DeadlineMissedStatus_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1073,7 +1073,7 @@ namespace eprosima { bool DeadlineMissedStatus_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1097,14 +1097,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1144,18 +1144,18 @@ namespace eprosima { bool MonitorServiceStatusDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1174,12 +1174,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MonitorServiceStatusDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1188,14 +1188,14 @@ namespace eprosima { MonitorServiceStatusData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1240,8 +1240,8 @@ namespace eprosima { } bool MonitorServiceStatusDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1260,7 +1260,7 @@ namespace eprosima { bool MonitorServiceStatusDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1284,14 +1284,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index a8e3e725d53..7938c6eaa10 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -61,11 +61,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -73,13 +73,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -140,11 +140,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -152,13 +152,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -219,11 +219,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -231,13 +231,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -299,11 +299,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -311,13 +311,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -378,11 +378,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -390,13 +390,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -457,11 +457,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -469,13 +469,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -553,11 +553,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -565,13 +565,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index 971db5a5e61..f2ad0bcbf73 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -57,18 +57,18 @@ namespace eprosima { bool EntityId_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -87,12 +87,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityId_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -101,14 +101,14 @@ namespace eprosima { EntityId_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -153,8 +153,8 @@ namespace eprosima { } bool EntityId_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -173,7 +173,7 @@ namespace eprosima { bool EntityId_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -197,14 +197,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -237,18 +237,18 @@ namespace eprosima { bool GuidPrefix_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -267,12 +267,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GuidPrefix_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -281,14 +281,14 @@ namespace eprosima { GuidPrefix_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -333,8 +333,8 @@ namespace eprosima { } bool GuidPrefix_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -353,7 +353,7 @@ namespace eprosima { bool GuidPrefix_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -377,14 +377,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -417,18 +417,18 @@ namespace eprosima { bool GUID_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -447,12 +447,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GUID_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -461,14 +461,14 @@ namespace eprosima { GUID_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -513,8 +513,8 @@ namespace eprosima { } bool GUID_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -533,7 +533,7 @@ namespace eprosima { bool GUID_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -557,14 +557,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -597,18 +597,18 @@ namespace eprosima { bool SequenceNumber_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -627,12 +627,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceNumber_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -641,14 +641,14 @@ namespace eprosima { SequenceNumber_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -693,8 +693,8 @@ namespace eprosima { } bool SequenceNumber_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -713,7 +713,7 @@ namespace eprosima { bool SequenceNumber_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -737,14 +737,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -777,18 +777,18 @@ namespace eprosima { bool SampleIdentity_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -807,12 +807,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SampleIdentity_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -821,14 +821,14 @@ namespace eprosima { SampleIdentity_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -873,8 +873,8 @@ namespace eprosima { } bool SampleIdentity_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -893,7 +893,7 @@ namespace eprosima { bool SampleIdentity_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -917,14 +917,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -957,18 +957,18 @@ namespace eprosima { bool Locator_sPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -987,12 +987,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Locator_sPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1001,14 +1001,14 @@ namespace eprosima { Locator_s* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1053,8 +1053,8 @@ namespace eprosima { } bool Locator_sPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1073,7 +1073,7 @@ namespace eprosima { bool Locator_sPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1097,14 +1097,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1139,18 +1139,18 @@ namespace eprosima { bool DiscoveryTimePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1169,12 +1169,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DiscoveryTimePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1183,14 +1183,14 @@ namespace eprosima { DiscoveryTime* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1235,8 +1235,8 @@ namespace eprosima { } bool DiscoveryTimePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1255,7 +1255,7 @@ namespace eprosima { bool DiscoveryTimePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1279,14 +1279,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1319,18 +1319,18 @@ namespace eprosima { bool EntityCountPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1349,12 +1349,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityCountPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1363,14 +1363,14 @@ namespace eprosima { EntityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1415,8 +1415,8 @@ namespace eprosima { } bool EntityCountPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1435,7 +1435,7 @@ namespace eprosima { bool EntityCountPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1459,14 +1459,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1499,18 +1499,18 @@ namespace eprosima { bool SampleIdentityCountPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1529,12 +1529,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SampleIdentityCountPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1543,14 +1543,14 @@ namespace eprosima { SampleIdentityCount* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1595,8 +1595,8 @@ namespace eprosima { } bool SampleIdentityCountPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1615,7 +1615,7 @@ namespace eprosima { bool SampleIdentityCountPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1639,14 +1639,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1679,18 +1679,18 @@ namespace eprosima { bool Entity2LocatorTrafficPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1709,12 +1709,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Entity2LocatorTrafficPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1723,14 +1723,14 @@ namespace eprosima { Entity2LocatorTraffic* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1775,8 +1775,8 @@ namespace eprosima { } bool Entity2LocatorTrafficPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1795,7 +1795,7 @@ namespace eprosima { bool Entity2LocatorTrafficPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1819,14 +1819,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1859,18 +1859,18 @@ namespace eprosima { bool WriterReaderDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1889,12 +1889,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool WriterReaderDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1903,14 +1903,14 @@ namespace eprosima { WriterReaderData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1955,8 +1955,8 @@ namespace eprosima { } bool WriterReaderDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1975,7 +1975,7 @@ namespace eprosima { bool WriterReaderDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1999,14 +1999,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2039,18 +2039,18 @@ namespace eprosima { bool Locator2LocatorDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2069,12 +2069,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Locator2LocatorDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2083,14 +2083,14 @@ namespace eprosima { Locator2LocatorData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2135,8 +2135,8 @@ namespace eprosima { } bool Locator2LocatorDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2155,7 +2155,7 @@ namespace eprosima { bool Locator2LocatorDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2179,14 +2179,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2219,18 +2219,18 @@ namespace eprosima { bool EntityDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2249,12 +2249,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EntityDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2263,14 +2263,14 @@ namespace eprosima { EntityData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2315,8 +2315,8 @@ namespace eprosima { } bool EntityDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2335,7 +2335,7 @@ namespace eprosima { bool EntityDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2359,14 +2359,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2399,18 +2399,18 @@ namespace eprosima { bool PhysicalDataPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2429,12 +2429,12 @@ namespace eprosima { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PhysicalDataPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2443,14 +2443,14 @@ namespace eprosima { PhysicalData* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2495,8 +2495,8 @@ namespace eprosima { } bool PhysicalDataPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2515,7 +2515,7 @@ namespace eprosima { bool PhysicalDataPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2539,14 +2539,14 @@ namespace eprosima { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index 2ec904ef7f9..b569c375f9e 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -62,11 +62,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -74,13 +74,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -141,11 +141,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -153,13 +153,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -220,11 +220,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -232,13 +232,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -299,11 +299,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -311,13 +311,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -378,11 +378,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -390,13 +390,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -457,11 +457,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -469,13 +469,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -537,11 +537,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -549,13 +549,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -616,11 +616,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -628,13 +628,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -695,11 +695,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -707,13 +707,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -774,11 +774,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -786,13 +786,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -853,11 +853,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -865,13 +865,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -932,11 +932,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -944,13 +944,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1011,11 +1011,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1023,13 +1023,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1090,11 +1090,11 @@ namespace eprosima eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1102,13 +1102,13 @@ namespace eprosima eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/aliasesPubSubTypes.cxx b/test/dds-types-test/aliasesPubSubTypes.cxx index 67700b7fa03..997c799cc90 100644 --- a/test/dds-types-test/aliasesPubSubTypes.cxx +++ b/test/dds-types-test/aliasesPubSubTypes.cxx @@ -53,18 +53,18 @@ AliasInt16PubSubType::~AliasInt16PubSubType() bool AliasInt16PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasInt16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool AliasInt16PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasInt16PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool AliasInt16PubSubType::deserialize( AliasInt16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void AliasInt16PubSubType::delete_data( } bool AliasInt16PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool AliasInt16PubSubType::compute_key( bool AliasInt16PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool AliasInt16PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ AliasUint16PubSubType::~AliasUint16PubSubType() bool AliasUint16PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasUint16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool AliasUint16PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasUint16PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool AliasUint16PubSubType::deserialize( AliasUint16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void AliasUint16PubSubType::delete_data( } bool AliasUint16PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool AliasUint16PubSubType::compute_key( bool AliasUint16PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool AliasUint16PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ AliasInt32PubSubType::~AliasInt32PubSubType() bool AliasInt32PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool AliasInt32PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasInt32PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool AliasInt32PubSubType::deserialize( AliasInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void AliasInt32PubSubType::delete_data( } bool AliasInt32PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool AliasInt32PubSubType::compute_key( bool AliasInt32PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool AliasInt32PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ AliasUInt32PubSubType::~AliasUInt32PubSubType() bool AliasUInt32PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasUInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool AliasUInt32PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasUInt32PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool AliasUInt32PubSubType::deserialize( AliasUInt32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void AliasUInt32PubSubType::delete_data( } bool AliasUInt32PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool AliasUInt32PubSubType::compute_key( bool AliasUInt32PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool AliasUInt32PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ AliasInt64PubSubType::~AliasInt64PubSubType() bool AliasInt64PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool AliasInt64PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasInt64PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool AliasInt64PubSubType::deserialize( AliasInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void AliasInt64PubSubType::delete_data( } bool AliasInt64PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool AliasInt64PubSubType::compute_key( bool AliasInt64PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool AliasInt64PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ AliasUInt64PubSubType::~AliasUInt64PubSubType() bool AliasUInt64PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasUInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool AliasUInt64PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasUInt64PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool AliasUInt64PubSubType::deserialize( AliasUInt64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void AliasUInt64PubSubType::delete_data( } bool AliasUInt64PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool AliasUInt64PubSubType::compute_key( bool AliasUInt64PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool AliasUInt64PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ AliasFloat32PubSubType::~AliasFloat32PubSubType() bool AliasFloat32PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasFloat32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool AliasFloat32PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasFloat32PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool AliasFloat32PubSubType::deserialize( AliasFloat32* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void AliasFloat32PubSubType::delete_data( } bool AliasFloat32PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool AliasFloat32PubSubType::compute_key( bool AliasFloat32PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool AliasFloat32PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ AliasFloat64PubSubType::~AliasFloat64PubSubType() bool AliasFloat64PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasFloat64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool AliasFloat64PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasFloat64PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool AliasFloat64PubSubType::deserialize( AliasFloat64* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void AliasFloat64PubSubType::delete_data( } bool AliasFloat64PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool AliasFloat64PubSubType::compute_key( bool AliasFloat64PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool AliasFloat64PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ AliasFloat128PubSubType::~AliasFloat128PubSubType() bool AliasFloat128PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasFloat128* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool AliasFloat128PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasFloat128PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool AliasFloat128PubSubType::deserialize( AliasFloat128* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void AliasFloat128PubSubType::delete_data( } bool AliasFloat128PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool AliasFloat128PubSubType::compute_key( bool AliasFloat128PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool AliasFloat128PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ AliasBoolPubSubType::~AliasBoolPubSubType() bool AliasBoolPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasBool* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool AliasBoolPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasBoolPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool AliasBoolPubSubType::deserialize( AliasBool* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void AliasBoolPubSubType::delete_data( } bool AliasBoolPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool AliasBoolPubSubType::compute_key( bool AliasBoolPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool AliasBoolPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ AliasOctetPubSubType::~AliasOctetPubSubType() bool AliasOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool AliasOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool AliasOctetPubSubType::deserialize( AliasOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void AliasOctetPubSubType::delete_data( } bool AliasOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool AliasOctetPubSubType::compute_key( bool AliasOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool AliasOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ AliasChar8PubSubType::~AliasChar8PubSubType() bool AliasChar8PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool AliasChar8PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasChar8PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool AliasChar8PubSubType::deserialize( AliasChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void AliasChar8PubSubType::delete_data( } bool AliasChar8PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool AliasChar8PubSubType::compute_key( bool AliasChar8PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool AliasChar8PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ AliasChar16PubSubType::~AliasChar16PubSubType() bool AliasChar16PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool AliasChar16PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasChar16PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool AliasChar16PubSubType::deserialize( AliasChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void AliasChar16PubSubType::delete_data( } bool AliasChar16PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool AliasChar16PubSubType::compute_key( bool AliasChar16PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool AliasChar16PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ AliasString8PubSubType::~AliasString8PubSubType() bool AliasString8PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasString8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool AliasString8PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasString8PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool AliasString8PubSubType::deserialize( AliasString8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void AliasString8PubSubType::delete_data( } bool AliasString8PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool AliasString8PubSubType::compute_key( bool AliasString8PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool AliasString8PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ AliasString16PubSubType::~AliasString16PubSubType() bool AliasString16PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasString16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool AliasString16PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasString16PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool AliasString16PubSubType::deserialize( AliasString16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void AliasString16PubSubType::delete_data( } bool AliasString16PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool AliasString16PubSubType::compute_key( bool AliasString16PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool AliasString16PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ AliasEnumPubSubType::~AliasEnumPubSubType() bool AliasEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool AliasEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool AliasEnumPubSubType::deserialize( AliasEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void AliasEnumPubSubType::delete_data( } bool AliasEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool AliasEnumPubSubType::compute_key( bool AliasEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool AliasEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ AliasBitmaskPubSubType::~AliasBitmaskPubSubType() bool AliasBitmaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasBitmask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool AliasBitmaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasBitmaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool AliasBitmaskPubSubType::deserialize( AliasBitmask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void AliasBitmaskPubSubType::delete_data( } bool AliasBitmaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool AliasBitmaskPubSubType::compute_key( bool AliasBitmaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool AliasBitmaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ AliasAliasPubSubType::~AliasAliasPubSubType() bool AliasAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool AliasAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool AliasAliasPubSubType::deserialize( AliasAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void AliasAliasPubSubType::delete_data( } bool AliasAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool AliasAliasPubSubType::compute_key( bool AliasAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool AliasAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ AliasArrayPubSubType::~AliasArrayPubSubType() bool AliasArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool AliasArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool AliasArrayPubSubType::deserialize( AliasArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void AliasArrayPubSubType::delete_data( } bool AliasArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool AliasArrayPubSubType::compute_key( bool AliasArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool AliasArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ AliasMultiArrayPubSubType::~AliasMultiArrayPubSubType() bool AliasMultiArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasMultiArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool AliasMultiArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasMultiArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool AliasMultiArrayPubSubType::deserialize( AliasMultiArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void AliasMultiArrayPubSubType::delete_data( } bool AliasMultiArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool AliasMultiArrayPubSubType::compute_key( bool AliasMultiArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool AliasMultiArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ AliasSequencePubSubType::~AliasSequencePubSubType() bool AliasSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool AliasSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool AliasSequencePubSubType::deserialize( AliasSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void AliasSequencePubSubType::delete_data( } bool AliasSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool AliasSequencePubSubType::compute_key( bool AliasSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool AliasSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ AliasMapPubSubType::~AliasMapPubSubType() bool AliasMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool AliasMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool AliasMapPubSubType::deserialize( AliasMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void AliasMapPubSubType::delete_data( } bool AliasMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool AliasMapPubSubType::compute_key( bool AliasMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool AliasMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ AliasUnionPubSubType::~AliasUnionPubSubType() bool AliasUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool AliasUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool AliasUnionPubSubType::deserialize( AliasUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void AliasUnionPubSubType::delete_data( } bool AliasUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool AliasUnionPubSubType::compute_key( bool AliasUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool AliasUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ AliasStructPubSubType::~AliasStructPubSubType() bool AliasStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool AliasStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool AliasStructPubSubType::deserialize( AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void AliasStructPubSubType::delete_data( } bool AliasStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool AliasStructPubSubType::compute_key( bool AliasStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool AliasStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ AliasBitsetPubSubType::~AliasBitsetPubSubType() bool AliasBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool AliasBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool AliasBitsetPubSubType::deserialize( AliasBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void AliasBitsetPubSubType::delete_data( } bool AliasBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool AliasBitsetPubSubType::compute_key( bool AliasBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool AliasBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index 4e87a098f74..ad359a8dcac 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -80,11 +80,11 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -92,13 +92,13 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -159,11 +159,11 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -171,13 +171,13 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -238,11 +238,11 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -250,13 +250,13 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -317,11 +317,11 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -329,13 +329,13 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -396,11 +396,11 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -408,13 +408,13 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -475,11 +475,11 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -487,13 +487,13 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -554,11 +554,11 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -566,13 +566,13 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -633,11 +633,11 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -645,13 +645,13 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -712,11 +712,11 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -724,13 +724,13 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -791,11 +791,11 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -803,13 +803,13 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -870,11 +870,11 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -882,13 +882,13 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -949,11 +949,11 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -961,13 +961,13 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1028,11 +1028,11 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1040,13 +1040,13 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1107,11 +1107,11 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1119,13 +1119,13 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1186,11 +1186,11 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1198,13 +1198,13 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1265,11 +1265,11 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1277,13 +1277,13 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1344,11 +1344,11 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1356,13 +1356,13 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1423,11 +1423,11 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1435,13 +1435,13 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1502,11 +1502,11 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1514,13 +1514,13 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1581,11 +1581,11 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1593,13 +1593,13 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1660,11 +1660,11 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1672,13 +1672,13 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1739,11 +1739,11 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1751,13 +1751,13 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1818,11 +1818,11 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1830,13 +1830,13 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1897,11 +1897,11 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1909,13 +1909,13 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1976,11 +1976,11 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1988,13 +1988,13 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/annotationsPubSubTypes.cxx b/test/dds-types-test/annotationsPubSubTypes.cxx index 3a66cee93ee..68b623e534c 100644 --- a/test/dds-types-test/annotationsPubSubTypes.cxx +++ b/test/dds-types-test/annotationsPubSubTypes.cxx @@ -53,18 +53,18 @@ AnnotatedStructPubSubType::~AnnotatedStructPubSubType() bool AnnotatedStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool AnnotatedStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AnnotatedStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool AnnotatedStructPubSubType::deserialize( AnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void AnnotatedStructPubSubType::delete_data( } bool AnnotatedStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool AnnotatedStructPubSubType::compute_key( bool AnnotatedStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool AnnotatedStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ EmptyAnnotatedStructPubSubType::~EmptyAnnotatedStructPubSubType() bool EmptyAnnotatedStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EmptyAnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool EmptyAnnotatedStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EmptyAnnotatedStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool EmptyAnnotatedStructPubSubType::deserialize( EmptyAnnotatedStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void EmptyAnnotatedStructPubSubType::delete_data( } bool EmptyAnnotatedStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool EmptyAnnotatedStructPubSubType::compute_key( bool EmptyAnnotatedStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool EmptyAnnotatedStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -414,18 +414,18 @@ BasicAnnotationsStructPubSubType::~BasicAnnotationsStructPubSubType() bool BasicAnnotationsStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BasicAnnotationsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -444,12 +444,12 @@ bool BasicAnnotationsStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BasicAnnotationsStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -458,14 +458,14 @@ bool BasicAnnotationsStructPubSubType::deserialize( BasicAnnotationsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -510,8 +510,8 @@ void BasicAnnotationsStructPubSubType::delete_data( } bool BasicAnnotationsStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -530,7 +530,7 @@ bool BasicAnnotationsStructPubSubType::compute_key( bool BasicAnnotationsStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -554,14 +554,14 @@ bool BasicAnnotationsStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index cfb729f5d55..075f94445f8 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -55,11 +55,11 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -214,11 +214,11 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -226,13 +226,13 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/appendablePubSubTypes.cxx b/test/dds-types-test/appendablePubSubTypes.cxx index e64da97db76..6b8dbf94777 100644 --- a/test/dds-types-test/appendablePubSubTypes.cxx +++ b/test/dds-types-test/appendablePubSubTypes.cxx @@ -53,18 +53,18 @@ AppendableShortStructPubSubType::~AppendableShortStructPubSubType() bool AppendableShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool AppendableShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool AppendableShortStructPubSubType::deserialize( AppendableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void AppendableShortStructPubSubType::delete_data( } bool AppendableShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool AppendableShortStructPubSubType::compute_key( bool AppendableShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool AppendableShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ AppendableUShortStructPubSubType::~AppendableUShortStructPubSubType() bool AppendableUShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool AppendableUShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableUShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool AppendableUShortStructPubSubType::deserialize( AppendableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void AppendableUShortStructPubSubType::delete_data( } bool AppendableUShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool AppendableUShortStructPubSubType::compute_key( bool AppendableUShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool AppendableUShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ AppendableLongStructPubSubType::~AppendableLongStructPubSubType() bool AppendableLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool AppendableLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool AppendableLongStructPubSubType::deserialize( AppendableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void AppendableLongStructPubSubType::delete_data( } bool AppendableLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool AppendableLongStructPubSubType::compute_key( bool AppendableLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool AppendableLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ AppendableULongStructPubSubType::~AppendableULongStructPubSubType() bool AppendableULongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool AppendableULongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableULongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool AppendableULongStructPubSubType::deserialize( AppendableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void AppendableULongStructPubSubType::delete_data( } bool AppendableULongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool AppendableULongStructPubSubType::compute_key( bool AppendableULongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool AppendableULongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ AppendableLongLongStructPubSubType::~AppendableLongLongStructPubSubType() bool AppendableLongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool AppendableLongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableLongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool AppendableLongLongStructPubSubType::deserialize( AppendableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void AppendableLongLongStructPubSubType::delete_data( } bool AppendableLongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool AppendableLongLongStructPubSubType::compute_key( bool AppendableLongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool AppendableLongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ AppendableULongLongStructPubSubType::~AppendableULongLongStructPubSubType() bool AppendableULongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool AppendableULongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableULongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool AppendableULongLongStructPubSubType::deserialize( AppendableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void AppendableULongLongStructPubSubType::delete_data( } bool AppendableULongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool AppendableULongLongStructPubSubType::compute_key( bool AppendableULongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool AppendableULongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ AppendableFloatStructPubSubType::~AppendableFloatStructPubSubType() bool AppendableFloatStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool AppendableFloatStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableFloatStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool AppendableFloatStructPubSubType::deserialize( AppendableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void AppendableFloatStructPubSubType::delete_data( } bool AppendableFloatStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool AppendableFloatStructPubSubType::compute_key( bool AppendableFloatStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool AppendableFloatStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ AppendableDoubleStructPubSubType::~AppendableDoubleStructPubSubType() bool AppendableDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool AppendableDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool AppendableDoubleStructPubSubType::deserialize( AppendableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void AppendableDoubleStructPubSubType::delete_data( } bool AppendableDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool AppendableDoubleStructPubSubType::compute_key( bool AppendableDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool AppendableDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ AppendableLongDoubleStructPubSubType::~AppendableLongDoubleStructPubSubType() bool AppendableLongDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool AppendableLongDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableLongDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool AppendableLongDoubleStructPubSubType::deserialize( AppendableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void AppendableLongDoubleStructPubSubType::delete_data( } bool AppendableLongDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool AppendableLongDoubleStructPubSubType::compute_key( bool AppendableLongDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool AppendableLongDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ AppendableBooleanStructPubSubType::~AppendableBooleanStructPubSubType() bool AppendableBooleanStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool AppendableBooleanStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableBooleanStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool AppendableBooleanStructPubSubType::deserialize( AppendableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void AppendableBooleanStructPubSubType::delete_data( } bool AppendableBooleanStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool AppendableBooleanStructPubSubType::compute_key( bool AppendableBooleanStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool AppendableBooleanStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ AppendableOctetStructPubSubType::~AppendableOctetStructPubSubType() bool AppendableOctetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool AppendableOctetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableOctetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool AppendableOctetStructPubSubType::deserialize( AppendableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void AppendableOctetStructPubSubType::delete_data( } bool AppendableOctetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool AppendableOctetStructPubSubType::compute_key( bool AppendableOctetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool AppendableOctetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ AppendableCharStructPubSubType::~AppendableCharStructPubSubType() bool AppendableCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool AppendableCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool AppendableCharStructPubSubType::deserialize( AppendableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void AppendableCharStructPubSubType::delete_data( } bool AppendableCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool AppendableCharStructPubSubType::compute_key( bool AppendableCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool AppendableCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ AppendableWCharStructPubSubType::~AppendableWCharStructPubSubType() bool AppendableWCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool AppendableWCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableWCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool AppendableWCharStructPubSubType::deserialize( AppendableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void AppendableWCharStructPubSubType::delete_data( } bool AppendableWCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool AppendableWCharStructPubSubType::compute_key( bool AppendableWCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool AppendableWCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ AppendableUnionStructPubSubType::~AppendableUnionStructPubSubType() bool AppendableUnionStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool AppendableUnionStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableUnionStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool AppendableUnionStructPubSubType::deserialize( AppendableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void AppendableUnionStructPubSubType::delete_data( } bool AppendableUnionStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool AppendableUnionStructPubSubType::compute_key( bool AppendableUnionStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool AppendableUnionStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ AppendableEmptyStructPubSubType::~AppendableEmptyStructPubSubType() bool AppendableEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool AppendableEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool AppendableEmptyStructPubSubType::deserialize( AppendableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void AppendableEmptyStructPubSubType::delete_data( } bool AppendableEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool AppendableEmptyStructPubSubType::compute_key( bool AppendableEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool AppendableEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ AppendableEmptyInheritanceStructPubSubType::~AppendableEmptyInheritanceStructPub bool AppendableEmptyInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool AppendableEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableEmptyInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool AppendableEmptyInheritanceStructPubSubType::deserialize( AppendableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void AppendableEmptyInheritanceStructPubSubType::delete_data( } bool AppendableEmptyInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool AppendableEmptyInheritanceStructPubSubType::compute_key( bool AppendableEmptyInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool AppendableEmptyInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ AppendableInheritanceStructPubSubType::~AppendableInheritanceStructPubSubType() bool AppendableInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool AppendableInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool AppendableInheritanceStructPubSubType::deserialize( AppendableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void AppendableInheritanceStructPubSubType::delete_data( } bool AppendableInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool AppendableInheritanceStructPubSubType::compute_key( bool AppendableInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool AppendableInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ AppendableInheritanceEmptyStructPubSubType::~AppendableInheritanceEmptyStructPub bool AppendableInheritanceEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool AppendableInheritanceEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableInheritanceEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool AppendableInheritanceEmptyStructPubSubType::deserialize( AppendableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void AppendableInheritanceEmptyStructPubSubType::delete_data( } bool AppendableInheritanceEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool AppendableInheritanceEmptyStructPubSubType::compute_key( bool AppendableInheritanceEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool AppendableInheritanceEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ AppendableExtensibilityInheritancePubSubType::~AppendableExtensibilityInheritanc bool AppendableExtensibilityInheritancePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool AppendableExtensibilityInheritancePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableExtensibilityInheritancePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool AppendableExtensibilityInheritancePubSubType::deserialize( AppendableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void AppendableExtensibilityInheritancePubSubType::delete_data( } bool AppendableExtensibilityInheritancePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool AppendableExtensibilityInheritancePubSubType::compute_key( bool AppendableExtensibilityInheritancePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool AppendableExtensibilityInheritancePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index b38c25f5e06..09451e078f3 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -55,11 +55,11 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/arraysPubSubTypes.cxx b/test/dds-types-test/arraysPubSubTypes.cxx index 9fff9547de6..b71eeea0a26 100644 --- a/test/dds-types-test/arraysPubSubTypes.cxx +++ b/test/dds-types-test/arraysPubSubTypes.cxx @@ -53,18 +53,18 @@ ArrayShortPubSubType::~ArrayShortPubSubType() bool ArrayShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool ArrayShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool ArrayShortPubSubType::deserialize( ArrayShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void ArrayShortPubSubType::delete_data( } bool ArrayShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool ArrayShortPubSubType::compute_key( bool ArrayShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool ArrayShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ArrayUShortPubSubType::~ArrayUShortPubSubType() bool ArrayUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ArrayUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ArrayUShortPubSubType::deserialize( ArrayUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ArrayUShortPubSubType::delete_data( } bool ArrayUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ArrayUShortPubSubType::compute_key( bool ArrayUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ArrayUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ ArrayLongPubSubType::~ArrayLongPubSubType() bool ArrayLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool ArrayLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool ArrayLongPubSubType::deserialize( ArrayLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void ArrayLongPubSubType::delete_data( } bool ArrayLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool ArrayLongPubSubType::compute_key( bool ArrayLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool ArrayLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ ArrayULongPubSubType::~ArrayULongPubSubType() bool ArrayULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool ArrayULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool ArrayULongPubSubType::deserialize( ArrayULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void ArrayULongPubSubType::delete_data( } bool ArrayULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool ArrayULongPubSubType::compute_key( bool ArrayULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool ArrayULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ ArrayLongLongPubSubType::~ArrayLongLongPubSubType() bool ArrayLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool ArrayLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool ArrayLongLongPubSubType::deserialize( ArrayLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void ArrayLongLongPubSubType::delete_data( } bool ArrayLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool ArrayLongLongPubSubType::compute_key( bool ArrayLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool ArrayLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ ArrayULongLongPubSubType::~ArrayULongLongPubSubType() bool ArrayULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool ArrayULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool ArrayULongLongPubSubType::deserialize( ArrayULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void ArrayULongLongPubSubType::delete_data( } bool ArrayULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool ArrayULongLongPubSubType::compute_key( bool ArrayULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool ArrayULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ ArrayFloatPubSubType::~ArrayFloatPubSubType() bool ArrayFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool ArrayFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool ArrayFloatPubSubType::deserialize( ArrayFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void ArrayFloatPubSubType::delete_data( } bool ArrayFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool ArrayFloatPubSubType::compute_key( bool ArrayFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool ArrayFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ ArrayDoublePubSubType::~ArrayDoublePubSubType() bool ArrayDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool ArrayDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool ArrayDoublePubSubType::deserialize( ArrayDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void ArrayDoublePubSubType::delete_data( } bool ArrayDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool ArrayDoublePubSubType::compute_key( bool ArrayDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool ArrayDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ ArrayLongDoublePubSubType::~ArrayLongDoublePubSubType() bool ArrayLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool ArrayLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool ArrayLongDoublePubSubType::deserialize( ArrayLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void ArrayLongDoublePubSubType::delete_data( } bool ArrayLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool ArrayLongDoublePubSubType::compute_key( bool ArrayLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool ArrayLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ ArrayBooleanPubSubType::~ArrayBooleanPubSubType() bool ArrayBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool ArrayBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool ArrayBooleanPubSubType::deserialize( ArrayBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void ArrayBooleanPubSubType::delete_data( } bool ArrayBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool ArrayBooleanPubSubType::compute_key( bool ArrayBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool ArrayBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ ArrayOctetPubSubType::~ArrayOctetPubSubType() bool ArrayOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool ArrayOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool ArrayOctetPubSubType::deserialize( ArrayOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void ArrayOctetPubSubType::delete_data( } bool ArrayOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool ArrayOctetPubSubType::compute_key( bool ArrayOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool ArrayOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ ArrayCharPubSubType::~ArrayCharPubSubType() bool ArrayCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool ArrayCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool ArrayCharPubSubType::deserialize( ArrayChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void ArrayCharPubSubType::delete_data( } bool ArrayCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool ArrayCharPubSubType::compute_key( bool ArrayCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool ArrayCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ ArrayWCharPubSubType::~ArrayWCharPubSubType() bool ArrayWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool ArrayWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool ArrayWCharPubSubType::deserialize( ArrayWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void ArrayWCharPubSubType::delete_data( } bool ArrayWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool ArrayWCharPubSubType::compute_key( bool ArrayWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool ArrayWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ ArrayStringPubSubType::~ArrayStringPubSubType() bool ArrayStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool ArrayStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool ArrayStringPubSubType::deserialize( ArrayString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void ArrayStringPubSubType::delete_data( } bool ArrayStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool ArrayStringPubSubType::compute_key( bool ArrayStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool ArrayStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ ArrayWStringPubSubType::~ArrayWStringPubSubType() bool ArrayWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool ArrayWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool ArrayWStringPubSubType::deserialize( ArrayWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void ArrayWStringPubSubType::delete_data( } bool ArrayWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool ArrayWStringPubSubType::compute_key( bool ArrayWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool ArrayWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ ArrayBoundedStringPubSubType::~ArrayBoundedStringPubSubType() bool ArrayBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool ArrayBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool ArrayBoundedStringPubSubType::deserialize( ArrayBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void ArrayBoundedStringPubSubType::delete_data( } bool ArrayBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool ArrayBoundedStringPubSubType::compute_key( bool ArrayBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool ArrayBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ ArrayBoundedWStringPubSubType::~ArrayBoundedWStringPubSubType() bool ArrayBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool ArrayBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool ArrayBoundedWStringPubSubType::deserialize( ArrayBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void ArrayBoundedWStringPubSubType::delete_data( } bool ArrayBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool ArrayBoundedWStringPubSubType::compute_key( bool ArrayBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool ArrayBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ ArrayEnumPubSubType::~ArrayEnumPubSubType() bool ArrayEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool ArrayEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool ArrayEnumPubSubType::deserialize( ArrayEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void ArrayEnumPubSubType::delete_data( } bool ArrayEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool ArrayEnumPubSubType::compute_key( bool ArrayEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool ArrayEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ ArrayBitMaskPubSubType::~ArrayBitMaskPubSubType() bool ArrayBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool ArrayBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool ArrayBitMaskPubSubType::deserialize( ArrayBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void ArrayBitMaskPubSubType::delete_data( } bool ArrayBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool ArrayBitMaskPubSubType::compute_key( bool ArrayBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool ArrayBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ ArrayAliasPubSubType::~ArrayAliasPubSubType() bool ArrayAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool ArrayAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool ArrayAliasPubSubType::deserialize( ArrayAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void ArrayAliasPubSubType::delete_data( } bool ArrayAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool ArrayAliasPubSubType::compute_key( bool ArrayAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool ArrayAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ ArrayShortArrayPubSubType::~ArrayShortArrayPubSubType() bool ArrayShortArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool ArrayShortArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayShortArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool ArrayShortArrayPubSubType::deserialize( ArrayShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void ArrayShortArrayPubSubType::delete_data( } bool ArrayShortArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool ArrayShortArrayPubSubType::compute_key( bool ArrayShortArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool ArrayShortArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ ArraySequencePubSubType::~ArraySequencePubSubType() bool ArraySequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool ArraySequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool ArraySequencePubSubType::deserialize( ArraySequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void ArraySequencePubSubType::delete_data( } bool ArraySequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool ArraySequencePubSubType::compute_key( bool ArraySequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool ArraySequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ ArrayMapPubSubType::~ArrayMapPubSubType() bool ArrayMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool ArrayMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool ArrayMapPubSubType::deserialize( ArrayMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void ArrayMapPubSubType::delete_data( } bool ArrayMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool ArrayMapPubSubType::compute_key( bool ArrayMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool ArrayMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ ArrayUnionPubSubType::~ArrayUnionPubSubType() bool ArrayUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool ArrayUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool ArrayUnionPubSubType::deserialize( ArrayUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void ArrayUnionPubSubType::delete_data( } bool ArrayUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool ArrayUnionPubSubType::compute_key( bool ArrayUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool ArrayUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ ArrayStructurePubSubType::~ArrayStructurePubSubType() bool ArrayStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool ArrayStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool ArrayStructurePubSubType::deserialize( ArrayStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void ArrayStructurePubSubType::delete_data( } bool ArrayStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool ArrayStructurePubSubType::compute_key( bool ArrayStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool ArrayStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ ArrayBitsetPubSubType::~ArrayBitsetPubSubType() bool ArrayBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool ArrayBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool ArrayBitsetPubSubType::deserialize( ArrayBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void ArrayBitsetPubSubType::delete_data( } bool ArrayBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool ArrayBitsetPubSubType::compute_key( bool ArrayBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool ArrayBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ ArrayMultiDimensionShortPubSubType::~ArrayMultiDimensionShortPubSubType() bool ArrayMultiDimensionShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool ArrayMultiDimensionShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool ArrayMultiDimensionShortPubSubType::deserialize( ArrayMultiDimensionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void ArrayMultiDimensionShortPubSubType::delete_data( } bool ArrayMultiDimensionShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool ArrayMultiDimensionShortPubSubType::compute_key( bool ArrayMultiDimensionShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool ArrayMultiDimensionShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ ArrayMultiDimensionUShortPubSubType::~ArrayMultiDimensionUShortPubSubType() bool ArrayMultiDimensionUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool ArrayMultiDimensionUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool ArrayMultiDimensionUShortPubSubType::deserialize( ArrayMultiDimensionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void ArrayMultiDimensionUShortPubSubType::delete_data( } bool ArrayMultiDimensionUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool ArrayMultiDimensionUShortPubSubType::compute_key( bool ArrayMultiDimensionUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool ArrayMultiDimensionUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5093,18 +5093,18 @@ ArrayMultiDimensionLongPubSubType::~ArrayMultiDimensionLongPubSubType() bool ArrayMultiDimensionLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5123,12 +5123,12 @@ bool ArrayMultiDimensionLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5137,14 +5137,14 @@ bool ArrayMultiDimensionLongPubSubType::deserialize( ArrayMultiDimensionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5189,8 +5189,8 @@ void ArrayMultiDimensionLongPubSubType::delete_data( } bool ArrayMultiDimensionLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5209,7 +5209,7 @@ bool ArrayMultiDimensionLongPubSubType::compute_key( bool ArrayMultiDimensionLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5233,14 +5233,14 @@ bool ArrayMultiDimensionLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5273,18 +5273,18 @@ ArrayMultiDimensionULongPubSubType::~ArrayMultiDimensionULongPubSubType() bool ArrayMultiDimensionULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5303,12 +5303,12 @@ bool ArrayMultiDimensionULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5317,14 +5317,14 @@ bool ArrayMultiDimensionULongPubSubType::deserialize( ArrayMultiDimensionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5369,8 +5369,8 @@ void ArrayMultiDimensionULongPubSubType::delete_data( } bool ArrayMultiDimensionULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5389,7 +5389,7 @@ bool ArrayMultiDimensionULongPubSubType::compute_key( bool ArrayMultiDimensionULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5413,14 +5413,14 @@ bool ArrayMultiDimensionULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5453,18 +5453,18 @@ ArrayMultiDimensionLongLongPubSubType::~ArrayMultiDimensionLongLongPubSubType() bool ArrayMultiDimensionLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5483,12 +5483,12 @@ bool ArrayMultiDimensionLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5497,14 +5497,14 @@ bool ArrayMultiDimensionLongLongPubSubType::deserialize( ArrayMultiDimensionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5549,8 +5549,8 @@ void ArrayMultiDimensionLongLongPubSubType::delete_data( } bool ArrayMultiDimensionLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5569,7 +5569,7 @@ bool ArrayMultiDimensionLongLongPubSubType::compute_key( bool ArrayMultiDimensionLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5593,14 +5593,14 @@ bool ArrayMultiDimensionLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5633,18 +5633,18 @@ ArrayMultiDimensionULongLongPubSubType::~ArrayMultiDimensionULongLongPubSubType( bool ArrayMultiDimensionULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5663,12 +5663,12 @@ bool ArrayMultiDimensionULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5677,14 +5677,14 @@ bool ArrayMultiDimensionULongLongPubSubType::deserialize( ArrayMultiDimensionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5729,8 +5729,8 @@ void ArrayMultiDimensionULongLongPubSubType::delete_data( } bool ArrayMultiDimensionULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5749,7 +5749,7 @@ bool ArrayMultiDimensionULongLongPubSubType::compute_key( bool ArrayMultiDimensionULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5773,14 +5773,14 @@ bool ArrayMultiDimensionULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5813,18 +5813,18 @@ ArrayMultiDimensionFloatPubSubType::~ArrayMultiDimensionFloatPubSubType() bool ArrayMultiDimensionFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5843,12 +5843,12 @@ bool ArrayMultiDimensionFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5857,14 +5857,14 @@ bool ArrayMultiDimensionFloatPubSubType::deserialize( ArrayMultiDimensionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5909,8 +5909,8 @@ void ArrayMultiDimensionFloatPubSubType::delete_data( } bool ArrayMultiDimensionFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5929,7 +5929,7 @@ bool ArrayMultiDimensionFloatPubSubType::compute_key( bool ArrayMultiDimensionFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5953,14 +5953,14 @@ bool ArrayMultiDimensionFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5993,18 +5993,18 @@ ArrayMultiDimensionDoublePubSubType::~ArrayMultiDimensionDoublePubSubType() bool ArrayMultiDimensionDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6023,12 +6023,12 @@ bool ArrayMultiDimensionDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6037,14 +6037,14 @@ bool ArrayMultiDimensionDoublePubSubType::deserialize( ArrayMultiDimensionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6089,8 +6089,8 @@ void ArrayMultiDimensionDoublePubSubType::delete_data( } bool ArrayMultiDimensionDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6109,7 +6109,7 @@ bool ArrayMultiDimensionDoublePubSubType::compute_key( bool ArrayMultiDimensionDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6133,14 +6133,14 @@ bool ArrayMultiDimensionDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6173,18 +6173,18 @@ ArrayMultiDimensionLongDoublePubSubType::~ArrayMultiDimensionLongDoublePubSubTyp bool ArrayMultiDimensionLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6203,12 +6203,12 @@ bool ArrayMultiDimensionLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6217,14 +6217,14 @@ bool ArrayMultiDimensionLongDoublePubSubType::deserialize( ArrayMultiDimensionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6269,8 +6269,8 @@ void ArrayMultiDimensionLongDoublePubSubType::delete_data( } bool ArrayMultiDimensionLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6289,7 +6289,7 @@ bool ArrayMultiDimensionLongDoublePubSubType::compute_key( bool ArrayMultiDimensionLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6313,14 +6313,14 @@ bool ArrayMultiDimensionLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6353,18 +6353,18 @@ ArrayMultiDimensionBooleanPubSubType::~ArrayMultiDimensionBooleanPubSubType() bool ArrayMultiDimensionBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6383,12 +6383,12 @@ bool ArrayMultiDimensionBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6397,14 +6397,14 @@ bool ArrayMultiDimensionBooleanPubSubType::deserialize( ArrayMultiDimensionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6449,8 +6449,8 @@ void ArrayMultiDimensionBooleanPubSubType::delete_data( } bool ArrayMultiDimensionBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6469,7 +6469,7 @@ bool ArrayMultiDimensionBooleanPubSubType::compute_key( bool ArrayMultiDimensionBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6493,14 +6493,14 @@ bool ArrayMultiDimensionBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6533,18 +6533,18 @@ ArrayMultiDimensionOctetPubSubType::~ArrayMultiDimensionOctetPubSubType() bool ArrayMultiDimensionOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6563,12 +6563,12 @@ bool ArrayMultiDimensionOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6577,14 +6577,14 @@ bool ArrayMultiDimensionOctetPubSubType::deserialize( ArrayMultiDimensionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6629,8 +6629,8 @@ void ArrayMultiDimensionOctetPubSubType::delete_data( } bool ArrayMultiDimensionOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6649,7 +6649,7 @@ bool ArrayMultiDimensionOctetPubSubType::compute_key( bool ArrayMultiDimensionOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6673,14 +6673,14 @@ bool ArrayMultiDimensionOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6713,18 +6713,18 @@ ArrayMultiDimensionCharPubSubType::~ArrayMultiDimensionCharPubSubType() bool ArrayMultiDimensionCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6743,12 +6743,12 @@ bool ArrayMultiDimensionCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6757,14 +6757,14 @@ bool ArrayMultiDimensionCharPubSubType::deserialize( ArrayMultiDimensionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6809,8 +6809,8 @@ void ArrayMultiDimensionCharPubSubType::delete_data( } bool ArrayMultiDimensionCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6829,7 +6829,7 @@ bool ArrayMultiDimensionCharPubSubType::compute_key( bool ArrayMultiDimensionCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6853,14 +6853,14 @@ bool ArrayMultiDimensionCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6893,18 +6893,18 @@ ArrayMultiDimensionWCharPubSubType::~ArrayMultiDimensionWCharPubSubType() bool ArrayMultiDimensionWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6923,12 +6923,12 @@ bool ArrayMultiDimensionWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6937,14 +6937,14 @@ bool ArrayMultiDimensionWCharPubSubType::deserialize( ArrayMultiDimensionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6989,8 +6989,8 @@ void ArrayMultiDimensionWCharPubSubType::delete_data( } bool ArrayMultiDimensionWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7009,7 +7009,7 @@ bool ArrayMultiDimensionWCharPubSubType::compute_key( bool ArrayMultiDimensionWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7033,14 +7033,14 @@ bool ArrayMultiDimensionWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7073,18 +7073,18 @@ ArrayMultiDimensionStringPubSubType::~ArrayMultiDimensionStringPubSubType() bool ArrayMultiDimensionStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7103,12 +7103,12 @@ bool ArrayMultiDimensionStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7117,14 +7117,14 @@ bool ArrayMultiDimensionStringPubSubType::deserialize( ArrayMultiDimensionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7169,8 +7169,8 @@ void ArrayMultiDimensionStringPubSubType::delete_data( } bool ArrayMultiDimensionStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7189,7 +7189,7 @@ bool ArrayMultiDimensionStringPubSubType::compute_key( bool ArrayMultiDimensionStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7213,14 +7213,14 @@ bool ArrayMultiDimensionStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7253,18 +7253,18 @@ ArrayMultiDimensionWStringPubSubType::~ArrayMultiDimensionWStringPubSubType() bool ArrayMultiDimensionWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7283,12 +7283,12 @@ bool ArrayMultiDimensionWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7297,14 +7297,14 @@ bool ArrayMultiDimensionWStringPubSubType::deserialize( ArrayMultiDimensionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7349,8 +7349,8 @@ void ArrayMultiDimensionWStringPubSubType::delete_data( } bool ArrayMultiDimensionWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7369,7 +7369,7 @@ bool ArrayMultiDimensionWStringPubSubType::compute_key( bool ArrayMultiDimensionWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7393,14 +7393,14 @@ bool ArrayMultiDimensionWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7433,18 +7433,18 @@ ArrayMultiDimensionBoundedStringPubSubType::~ArrayMultiDimensionBoundedStringPub bool ArrayMultiDimensionBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7463,12 +7463,12 @@ bool ArrayMultiDimensionBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7477,14 +7477,14 @@ bool ArrayMultiDimensionBoundedStringPubSubType::deserialize( ArrayMultiDimensionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7529,8 +7529,8 @@ void ArrayMultiDimensionBoundedStringPubSubType::delete_data( } bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7549,7 +7549,7 @@ bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7573,14 +7573,14 @@ bool ArrayMultiDimensionBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7613,18 +7613,18 @@ ArrayMultiDimensionBoundedWStringPubSubType::~ArrayMultiDimensionBoundedWStringP bool ArrayMultiDimensionBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7643,12 +7643,12 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7657,14 +7657,14 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::deserialize( ArrayMultiDimensionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7709,8 +7709,8 @@ void ArrayMultiDimensionBoundedWStringPubSubType::delete_data( } bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7729,7 +7729,7 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7753,14 +7753,14 @@ bool ArrayMultiDimensionBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7793,18 +7793,18 @@ ArrayMultiDimensionEnumPubSubType::~ArrayMultiDimensionEnumPubSubType() bool ArrayMultiDimensionEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7823,12 +7823,12 @@ bool ArrayMultiDimensionEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7837,14 +7837,14 @@ bool ArrayMultiDimensionEnumPubSubType::deserialize( ArrayMultiDimensionEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7889,8 +7889,8 @@ void ArrayMultiDimensionEnumPubSubType::delete_data( } bool ArrayMultiDimensionEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7909,7 +7909,7 @@ bool ArrayMultiDimensionEnumPubSubType::compute_key( bool ArrayMultiDimensionEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7933,14 +7933,14 @@ bool ArrayMultiDimensionEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7973,18 +7973,18 @@ ArrayMultiDimensionBitMaskPubSubType::~ArrayMultiDimensionBitMaskPubSubType() bool ArrayMultiDimensionBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8003,12 +8003,12 @@ bool ArrayMultiDimensionBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8017,14 +8017,14 @@ bool ArrayMultiDimensionBitMaskPubSubType::deserialize( ArrayMultiDimensionBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8069,8 +8069,8 @@ void ArrayMultiDimensionBitMaskPubSubType::delete_data( } bool ArrayMultiDimensionBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8089,7 +8089,7 @@ bool ArrayMultiDimensionBitMaskPubSubType::compute_key( bool ArrayMultiDimensionBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8113,14 +8113,14 @@ bool ArrayMultiDimensionBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8153,18 +8153,18 @@ ArrayMultiDimensionAliasPubSubType::~ArrayMultiDimensionAliasPubSubType() bool ArrayMultiDimensionAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8183,12 +8183,12 @@ bool ArrayMultiDimensionAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8197,14 +8197,14 @@ bool ArrayMultiDimensionAliasPubSubType::deserialize( ArrayMultiDimensionAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8249,8 +8249,8 @@ void ArrayMultiDimensionAliasPubSubType::delete_data( } bool ArrayMultiDimensionAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8269,7 +8269,7 @@ bool ArrayMultiDimensionAliasPubSubType::compute_key( bool ArrayMultiDimensionAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8293,14 +8293,14 @@ bool ArrayMultiDimensionAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8333,18 +8333,18 @@ ArrayMultiDimensionSequencePubSubType::~ArrayMultiDimensionSequencePubSubType() bool ArrayMultiDimensionSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8363,12 +8363,12 @@ bool ArrayMultiDimensionSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8377,14 +8377,14 @@ bool ArrayMultiDimensionSequencePubSubType::deserialize( ArrayMultiDimensionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8429,8 +8429,8 @@ void ArrayMultiDimensionSequencePubSubType::delete_data( } bool ArrayMultiDimensionSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8449,7 +8449,7 @@ bool ArrayMultiDimensionSequencePubSubType::compute_key( bool ArrayMultiDimensionSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8473,14 +8473,14 @@ bool ArrayMultiDimensionSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8513,18 +8513,18 @@ ArrayMultiDimensionMapPubSubType::~ArrayMultiDimensionMapPubSubType() bool ArrayMultiDimensionMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8543,12 +8543,12 @@ bool ArrayMultiDimensionMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8557,14 +8557,14 @@ bool ArrayMultiDimensionMapPubSubType::deserialize( ArrayMultiDimensionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8609,8 +8609,8 @@ void ArrayMultiDimensionMapPubSubType::delete_data( } bool ArrayMultiDimensionMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8629,7 +8629,7 @@ bool ArrayMultiDimensionMapPubSubType::compute_key( bool ArrayMultiDimensionMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8653,14 +8653,14 @@ bool ArrayMultiDimensionMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8693,18 +8693,18 @@ ArrayMultiDimensionUnionPubSubType::~ArrayMultiDimensionUnionPubSubType() bool ArrayMultiDimensionUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8723,12 +8723,12 @@ bool ArrayMultiDimensionUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8737,14 +8737,14 @@ bool ArrayMultiDimensionUnionPubSubType::deserialize( ArrayMultiDimensionUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8789,8 +8789,8 @@ void ArrayMultiDimensionUnionPubSubType::delete_data( } bool ArrayMultiDimensionUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8809,7 +8809,7 @@ bool ArrayMultiDimensionUnionPubSubType::compute_key( bool ArrayMultiDimensionUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8833,14 +8833,14 @@ bool ArrayMultiDimensionUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8873,18 +8873,18 @@ ArrayMultiDimensionStructurePubSubType::~ArrayMultiDimensionStructurePubSubType( bool ArrayMultiDimensionStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8903,12 +8903,12 @@ bool ArrayMultiDimensionStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8917,14 +8917,14 @@ bool ArrayMultiDimensionStructurePubSubType::deserialize( ArrayMultiDimensionStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8969,8 +8969,8 @@ void ArrayMultiDimensionStructurePubSubType::delete_data( } bool ArrayMultiDimensionStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8989,7 +8989,7 @@ bool ArrayMultiDimensionStructurePubSubType::compute_key( bool ArrayMultiDimensionStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9013,14 +9013,14 @@ bool ArrayMultiDimensionStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9053,18 +9053,18 @@ ArrayMultiDimensionBitsetPubSubType::~ArrayMultiDimensionBitsetPubSubType() bool ArrayMultiDimensionBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9083,12 +9083,12 @@ bool ArrayMultiDimensionBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9097,14 +9097,14 @@ bool ArrayMultiDimensionBitsetPubSubType::deserialize( ArrayMultiDimensionBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9149,8 +9149,8 @@ void ArrayMultiDimensionBitsetPubSubType::delete_data( } bool ArrayMultiDimensionBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9169,7 +9169,7 @@ bool ArrayMultiDimensionBitsetPubSubType::compute_key( bool ArrayMultiDimensionBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9193,14 +9193,14 @@ bool ArrayMultiDimensionBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9235,18 +9235,18 @@ ArraySingleDimensionLiteralsShortPubSubType::~ArraySingleDimensionLiteralsShortP bool ArraySingleDimensionLiteralsShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9265,12 +9265,12 @@ bool ArraySingleDimensionLiteralsShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9279,14 +9279,14 @@ bool ArraySingleDimensionLiteralsShortPubSubType::deserialize( ArraySingleDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9331,8 +9331,8 @@ void ArraySingleDimensionLiteralsShortPubSubType::delete_data( } bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9351,7 +9351,7 @@ bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9375,14 +9375,14 @@ bool ArraySingleDimensionLiteralsShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9415,18 +9415,18 @@ ArraySingleDimensionLiteralsUnsignedShortPubSubType::~ArraySingleDimensionLitera bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9445,12 +9445,12 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9459,14 +9459,14 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::deserialize( ArraySingleDimensionLiteralsUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9511,8 +9511,8 @@ void ArraySingleDimensionLiteralsUnsignedShortPubSubType::delete_data( } bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9531,7 +9531,7 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9555,14 +9555,14 @@ bool ArraySingleDimensionLiteralsUnsignedShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9595,18 +9595,18 @@ ArraySingleDimensionLiteralsLongPubSubType::~ArraySingleDimensionLiteralsLongPub bool ArraySingleDimensionLiteralsLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9625,12 +9625,12 @@ bool ArraySingleDimensionLiteralsLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9639,14 +9639,14 @@ bool ArraySingleDimensionLiteralsLongPubSubType::deserialize( ArraySingleDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9691,8 +9691,8 @@ void ArraySingleDimensionLiteralsLongPubSubType::delete_data( } bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9711,7 +9711,7 @@ bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9735,14 +9735,14 @@ bool ArraySingleDimensionLiteralsLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9775,18 +9775,18 @@ ArraySingleDimensionLiteralsUnsignedLongPubSubType::~ArraySingleDimensionLiteral bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9805,12 +9805,12 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9819,14 +9819,14 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::deserialize( ArraySingleDimensionLiteralsUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9871,8 +9871,8 @@ void ArraySingleDimensionLiteralsUnsignedLongPubSubType::delete_data( } bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9891,7 +9891,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9915,14 +9915,14 @@ bool ArraySingleDimensionLiteralsUnsignedLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9955,18 +9955,18 @@ ArraySingleDimensionLiteralsLongLongPubSubType::~ArraySingleDimensionLiteralsLon bool ArraySingleDimensionLiteralsLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9985,12 +9985,12 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9999,14 +9999,14 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::deserialize( ArraySingleDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10051,8 +10051,8 @@ void ArraySingleDimensionLiteralsLongLongPubSubType::delete_data( } bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10071,7 +10071,7 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10095,14 +10095,14 @@ bool ArraySingleDimensionLiteralsLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10135,18 +10135,18 @@ ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::~ArraySingleDimensionLit bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10165,12 +10165,12 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10179,14 +10179,14 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::deserialize( ArraySingleDimensionLiteralsUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10231,8 +10231,8 @@ void ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::delete_data( } bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10251,7 +10251,7 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10275,14 +10275,14 @@ bool ArraySingleDimensionLiteralsUnsignedLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10315,18 +10315,18 @@ ArraySingleDimensionLiteralsFloatPubSubType::~ArraySingleDimensionLiteralsFloatP bool ArraySingleDimensionLiteralsFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10345,12 +10345,12 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10359,14 +10359,14 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::deserialize( ArraySingleDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10411,8 +10411,8 @@ void ArraySingleDimensionLiteralsFloatPubSubType::delete_data( } bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10431,7 +10431,7 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10455,14 +10455,14 @@ bool ArraySingleDimensionLiteralsFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10495,18 +10495,18 @@ ArraySingleDimensionLiteralsDoublePubSubType::~ArraySingleDimensionLiteralsDoubl bool ArraySingleDimensionLiteralsDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10525,12 +10525,12 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10539,14 +10539,14 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::deserialize( ArraySingleDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10591,8 +10591,8 @@ void ArraySingleDimensionLiteralsDoublePubSubType::delete_data( } bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10611,7 +10611,7 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10635,14 +10635,14 @@ bool ArraySingleDimensionLiteralsDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10675,18 +10675,18 @@ ArraySingleDimensionLiteralsLongDoublePubSubType::~ArraySingleDimensionLiteralsL bool ArraySingleDimensionLiteralsLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10705,12 +10705,12 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10719,14 +10719,14 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::deserialize( ArraySingleDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10771,8 +10771,8 @@ void ArraySingleDimensionLiteralsLongDoublePubSubType::delete_data( } bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10791,7 +10791,7 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10815,14 +10815,14 @@ bool ArraySingleDimensionLiteralsLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10855,18 +10855,18 @@ ArraySingleDimensionLiteralsBooleanPubSubType::~ArraySingleDimensionLiteralsBool bool ArraySingleDimensionLiteralsBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10885,12 +10885,12 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10899,14 +10899,14 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::deserialize( ArraySingleDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10951,8 +10951,8 @@ void ArraySingleDimensionLiteralsBooleanPubSubType::delete_data( } bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10971,7 +10971,7 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10995,14 +10995,14 @@ bool ArraySingleDimensionLiteralsBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11035,18 +11035,18 @@ ArraySingleDimensionLiteralsOctetPubSubType::~ArraySingleDimensionLiteralsOctetP bool ArraySingleDimensionLiteralsOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11065,12 +11065,12 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11079,14 +11079,14 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::deserialize( ArraySingleDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11131,8 +11131,8 @@ void ArraySingleDimensionLiteralsOctetPubSubType::delete_data( } bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11151,7 +11151,7 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11175,14 +11175,14 @@ bool ArraySingleDimensionLiteralsOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11215,18 +11215,18 @@ ArraySingleDimensionLiteralsCharPubSubType::~ArraySingleDimensionLiteralsCharPub bool ArraySingleDimensionLiteralsCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11245,12 +11245,12 @@ bool ArraySingleDimensionLiteralsCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11259,14 +11259,14 @@ bool ArraySingleDimensionLiteralsCharPubSubType::deserialize( ArraySingleDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11311,8 +11311,8 @@ void ArraySingleDimensionLiteralsCharPubSubType::delete_data( } bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11331,7 +11331,7 @@ bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11355,14 +11355,14 @@ bool ArraySingleDimensionLiteralsCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11395,18 +11395,18 @@ ArraySingleDimensionLiteralsWCharPubSubType::~ArraySingleDimensionLiteralsWCharP bool ArraySingleDimensionLiteralsWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11425,12 +11425,12 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11439,14 +11439,14 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::deserialize( ArraySingleDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11491,8 +11491,8 @@ void ArraySingleDimensionLiteralsWCharPubSubType::delete_data( } bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11511,7 +11511,7 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11535,14 +11535,14 @@ bool ArraySingleDimensionLiteralsWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11575,18 +11575,18 @@ ArraySingleDimensionLiteralsStringPubSubType::~ArraySingleDimensionLiteralsStrin bool ArraySingleDimensionLiteralsStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11605,12 +11605,12 @@ bool ArraySingleDimensionLiteralsStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11619,14 +11619,14 @@ bool ArraySingleDimensionLiteralsStringPubSubType::deserialize( ArraySingleDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11671,8 +11671,8 @@ void ArraySingleDimensionLiteralsStringPubSubType::delete_data( } bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11691,7 +11691,7 @@ bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11715,14 +11715,14 @@ bool ArraySingleDimensionLiteralsStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11755,18 +11755,18 @@ ArraySingleDimensionLiteralsWStringPubSubType::~ArraySingleDimensionLiteralsWStr bool ArraySingleDimensionLiteralsWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11785,12 +11785,12 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11799,14 +11799,14 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::deserialize( ArraySingleDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11851,8 +11851,8 @@ void ArraySingleDimensionLiteralsWStringPubSubType::delete_data( } bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11871,7 +11871,7 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11895,14 +11895,14 @@ bool ArraySingleDimensionLiteralsWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11935,18 +11935,18 @@ ArraySingleDimensionLiteralsBoundedStringPubSubType::~ArraySingleDimensionLitera bool ArraySingleDimensionLiteralsBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11965,12 +11965,12 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11979,14 +11979,14 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::deserialize( ArraySingleDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12031,8 +12031,8 @@ void ArraySingleDimensionLiteralsBoundedStringPubSubType::delete_data( } bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12051,7 +12051,7 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12075,14 +12075,14 @@ bool ArraySingleDimensionLiteralsBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12115,18 +12115,18 @@ ArraySingleDimensionLiteralsBoundedWStringPubSubType::~ArraySingleDimensionLiter bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12145,12 +12145,12 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12159,14 +12159,14 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::deserialize( ArraySingleDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12211,8 +12211,8 @@ void ArraySingleDimensionLiteralsBoundedWStringPubSubType::delete_data( } bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12231,7 +12231,7 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12255,14 +12255,14 @@ bool ArraySingleDimensionLiteralsBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12295,18 +12295,18 @@ ArraySingleDimensionLiteralsEnumPubSubType::~ArraySingleDimensionLiteralsEnumPub bool ArraySingleDimensionLiteralsEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12325,12 +12325,12 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12339,14 +12339,14 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::deserialize( ArraySingleDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12391,8 +12391,8 @@ void ArraySingleDimensionLiteralsEnumPubSubType::delete_data( } bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12411,7 +12411,7 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12435,14 +12435,14 @@ bool ArraySingleDimensionLiteralsEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12475,18 +12475,18 @@ ArraySingleDimensionLiteralsBitMaskPubSubType::~ArraySingleDimensionLiteralsBitM bool ArraySingleDimensionLiteralsBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12505,12 +12505,12 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12519,14 +12519,14 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::deserialize( ArraySingleDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12571,8 +12571,8 @@ void ArraySingleDimensionLiteralsBitMaskPubSubType::delete_data( } bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12591,7 +12591,7 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12615,14 +12615,14 @@ bool ArraySingleDimensionLiteralsBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12655,18 +12655,18 @@ ArraySingleDimensionLiteralsAliasPubSubType::~ArraySingleDimensionLiteralsAliasP bool ArraySingleDimensionLiteralsAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12685,12 +12685,12 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12699,14 +12699,14 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::deserialize( ArraySingleDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12751,8 +12751,8 @@ void ArraySingleDimensionLiteralsAliasPubSubType::delete_data( } bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12771,7 +12771,7 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12795,14 +12795,14 @@ bool ArraySingleDimensionLiteralsAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12835,18 +12835,18 @@ ArraySingleDimensionLiteralsShortArrayPubSubType::~ArraySingleDimensionLiteralsS bool ArraySingleDimensionLiteralsShortArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12865,12 +12865,12 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsShortArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12879,14 +12879,14 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::deserialize( ArraySingleDimensionLiteralsShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12931,8 +12931,8 @@ void ArraySingleDimensionLiteralsShortArrayPubSubType::delete_data( } bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12951,7 +12951,7 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12975,14 +12975,14 @@ bool ArraySingleDimensionLiteralsShortArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13015,18 +13015,18 @@ ArraySingleDimensionLiteralsSequencePubSubType::~ArraySingleDimensionLiteralsSeq bool ArraySingleDimensionLiteralsSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13045,12 +13045,12 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13059,14 +13059,14 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::deserialize( ArraySingleDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13111,8 +13111,8 @@ void ArraySingleDimensionLiteralsSequencePubSubType::delete_data( } bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13131,7 +13131,7 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13155,14 +13155,14 @@ bool ArraySingleDimensionLiteralsSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13195,18 +13195,18 @@ ArraySingleDimensionLiteralsMapPubSubType::~ArraySingleDimensionLiteralsMapPubSu bool ArraySingleDimensionLiteralsMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13225,12 +13225,12 @@ bool ArraySingleDimensionLiteralsMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13239,14 +13239,14 @@ bool ArraySingleDimensionLiteralsMapPubSubType::deserialize( ArraySingleDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13291,8 +13291,8 @@ void ArraySingleDimensionLiteralsMapPubSubType::delete_data( } bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13311,7 +13311,7 @@ bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13335,14 +13335,14 @@ bool ArraySingleDimensionLiteralsMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13375,18 +13375,18 @@ ArraySingleDimensionLiteralsUnionPubSubType::~ArraySingleDimensionLiteralsUnionP bool ArraySingleDimensionLiteralsUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13405,12 +13405,12 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13419,14 +13419,14 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::deserialize( ArraySingleDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13471,8 +13471,8 @@ void ArraySingleDimensionLiteralsUnionPubSubType::delete_data( } bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13491,7 +13491,7 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13515,14 +13515,14 @@ bool ArraySingleDimensionLiteralsUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13555,18 +13555,18 @@ ArraySingleDimensionLiteralsStructurePubSubType::~ArraySingleDimensionLiteralsSt bool ArraySingleDimensionLiteralsStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13585,12 +13585,12 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13599,14 +13599,14 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::deserialize( ArraySingleDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13651,8 +13651,8 @@ void ArraySingleDimensionLiteralsStructurePubSubType::delete_data( } bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13671,7 +13671,7 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13695,14 +13695,14 @@ bool ArraySingleDimensionLiteralsStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13735,18 +13735,18 @@ ArraySingleDimensionLiteralsBitsetPubSubType::~ArraySingleDimensionLiteralsBitse bool ArraySingleDimensionLiteralsBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArraySingleDimensionLiteralsBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13765,12 +13765,12 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArraySingleDimensionLiteralsBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13779,14 +13779,14 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::deserialize( ArraySingleDimensionLiteralsBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13831,8 +13831,8 @@ void ArraySingleDimensionLiteralsBitsetPubSubType::delete_data( } bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13851,7 +13851,7 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13875,14 +13875,14 @@ bool ArraySingleDimensionLiteralsBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13915,18 +13915,18 @@ ArrayMultiDimensionLiteralsShortPubSubType::~ArrayMultiDimensionLiteralsShortPub bool ArrayMultiDimensionLiteralsShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13945,12 +13945,12 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13959,14 +13959,14 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::deserialize( ArrayMultiDimensionLiteralsShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14011,8 +14011,8 @@ void ArrayMultiDimensionLiteralsShortPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14031,7 +14031,7 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14055,14 +14055,14 @@ bool ArrayMultiDimensionLiteralsShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14095,18 +14095,18 @@ ArrayMultiDimensionLiteralsUShortPubSubType::~ArrayMultiDimensionLiteralsUShortP bool ArrayMultiDimensionLiteralsUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14125,12 +14125,12 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14139,14 +14139,14 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::deserialize( ArrayMultiDimensionLiteralsUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14191,8 +14191,8 @@ void ArrayMultiDimensionLiteralsUShortPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14211,7 +14211,7 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14235,14 +14235,14 @@ bool ArrayMultiDimensionLiteralsUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14275,18 +14275,18 @@ ArrayMultiDimensionLiteralsLongPubSubType::~ArrayMultiDimensionLiteralsLongPubSu bool ArrayMultiDimensionLiteralsLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14305,12 +14305,12 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14319,14 +14319,14 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::deserialize( ArrayMultiDimensionLiteralsLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14371,8 +14371,8 @@ void ArrayMultiDimensionLiteralsLongPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14391,7 +14391,7 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14415,14 +14415,14 @@ bool ArrayMultiDimensionLiteralsLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14455,18 +14455,18 @@ ArrayMultiDimensionLiteralsULongPubSubType::~ArrayMultiDimensionLiteralsULongPub bool ArrayMultiDimensionLiteralsULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14485,12 +14485,12 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14499,14 +14499,14 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::deserialize( ArrayMultiDimensionLiteralsULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14551,8 +14551,8 @@ void ArrayMultiDimensionLiteralsULongPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14571,7 +14571,7 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14595,14 +14595,14 @@ bool ArrayMultiDimensionLiteralsULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14635,18 +14635,18 @@ ArrayMultiDimensionLiteralsLongLongPubSubType::~ArrayMultiDimensionLiteralsLongL bool ArrayMultiDimensionLiteralsLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14665,12 +14665,12 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14679,14 +14679,14 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::deserialize( ArrayMultiDimensionLiteralsLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14731,8 +14731,8 @@ void ArrayMultiDimensionLiteralsLongLongPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14751,7 +14751,7 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14775,14 +14775,14 @@ bool ArrayMultiDimensionLiteralsLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14815,18 +14815,18 @@ ArrayMultiDimensionLiteralsULongLongPubSubType::~ArrayMultiDimensionLiteralsULon bool ArrayMultiDimensionLiteralsULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14845,12 +14845,12 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14859,14 +14859,14 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::deserialize( ArrayMultiDimensionLiteralsULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14911,8 +14911,8 @@ void ArrayMultiDimensionLiteralsULongLongPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14931,7 +14931,7 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14955,14 +14955,14 @@ bool ArrayMultiDimensionLiteralsULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14995,18 +14995,18 @@ ArrayMultiDimensionLiteralsFloatPubSubType::~ArrayMultiDimensionLiteralsFloatPub bool ArrayMultiDimensionLiteralsFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15025,12 +15025,12 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15039,14 +15039,14 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::deserialize( ArrayMultiDimensionLiteralsFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15091,8 +15091,8 @@ void ArrayMultiDimensionLiteralsFloatPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15111,7 +15111,7 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15135,14 +15135,14 @@ bool ArrayMultiDimensionLiteralsFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15175,18 +15175,18 @@ ArrayMultiDimensionLiteralsDoublePubSubType::~ArrayMultiDimensionLiteralsDoubleP bool ArrayMultiDimensionLiteralsDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15205,12 +15205,12 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15219,14 +15219,14 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::deserialize( ArrayMultiDimensionLiteralsDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15271,8 +15271,8 @@ void ArrayMultiDimensionLiteralsDoublePubSubType::delete_data( } bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15291,7 +15291,7 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15315,14 +15315,14 @@ bool ArrayMultiDimensionLiteralsDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15355,18 +15355,18 @@ ArrayMultiDimensionLiteralsLongDoublePubSubType::~ArrayMultiDimensionLiteralsLon bool ArrayMultiDimensionLiteralsLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15385,12 +15385,12 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15399,14 +15399,14 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::deserialize( ArrayMultiDimensionLiteralsLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15451,8 +15451,8 @@ void ArrayMultiDimensionLiteralsLongDoublePubSubType::delete_data( } bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15471,7 +15471,7 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15495,14 +15495,14 @@ bool ArrayMultiDimensionLiteralsLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15535,18 +15535,18 @@ ArrayMultiDimensionLiteralsBooleanPubSubType::~ArrayMultiDimensionLiteralsBoolea bool ArrayMultiDimensionLiteralsBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15565,12 +15565,12 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15579,14 +15579,14 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::deserialize( ArrayMultiDimensionLiteralsBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15631,8 +15631,8 @@ void ArrayMultiDimensionLiteralsBooleanPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15651,7 +15651,7 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15675,14 +15675,14 @@ bool ArrayMultiDimensionLiteralsBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15715,18 +15715,18 @@ ArrayMultiDimensionLiteralsOctetPubSubType::~ArrayMultiDimensionLiteralsOctetPub bool ArrayMultiDimensionLiteralsOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15745,12 +15745,12 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15759,14 +15759,14 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::deserialize( ArrayMultiDimensionLiteralsOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15811,8 +15811,8 @@ void ArrayMultiDimensionLiteralsOctetPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15831,7 +15831,7 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15855,14 +15855,14 @@ bool ArrayMultiDimensionLiteralsOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15895,18 +15895,18 @@ ArrayMultiDimensionLiteralsCharPubSubType::~ArrayMultiDimensionLiteralsCharPubSu bool ArrayMultiDimensionLiteralsCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15925,12 +15925,12 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15939,14 +15939,14 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::deserialize( ArrayMultiDimensionLiteralsChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15991,8 +15991,8 @@ void ArrayMultiDimensionLiteralsCharPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16011,7 +16011,7 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16035,14 +16035,14 @@ bool ArrayMultiDimensionLiteralsCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16075,18 +16075,18 @@ ArrayMultiDimensionLiteralsWCharPubSubType::~ArrayMultiDimensionLiteralsWCharPub bool ArrayMultiDimensionLiteralsWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16105,12 +16105,12 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16119,14 +16119,14 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::deserialize( ArrayMultiDimensionLiteralsWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16171,8 +16171,8 @@ void ArrayMultiDimensionLiteralsWCharPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16191,7 +16191,7 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16215,14 +16215,14 @@ bool ArrayMultiDimensionLiteralsWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16255,18 +16255,18 @@ ArrayMultiDimensionLiteralsStringPubSubType::~ArrayMultiDimensionLiteralsStringP bool ArrayMultiDimensionLiteralsStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16285,12 +16285,12 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16299,14 +16299,14 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::deserialize( ArrayMultiDimensionLiteralsString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16351,8 +16351,8 @@ void ArrayMultiDimensionLiteralsStringPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16371,7 +16371,7 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16395,14 +16395,14 @@ bool ArrayMultiDimensionLiteralsStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16435,18 +16435,18 @@ ArrayMultiDimensionLiteralsWStringPubSubType::~ArrayMultiDimensionLiteralsWStrin bool ArrayMultiDimensionLiteralsWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16465,12 +16465,12 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16479,14 +16479,14 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::deserialize( ArrayMultiDimensionLiteralsWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16531,8 +16531,8 @@ void ArrayMultiDimensionLiteralsWStringPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16551,7 +16551,7 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16575,14 +16575,14 @@ bool ArrayMultiDimensionLiteralsWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16615,18 +16615,18 @@ ArrayMultiDimensionLiteralsBoundedStringPubSubType::~ArrayMultiDimensionLiterals bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16645,12 +16645,12 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16659,14 +16659,14 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::deserialize( ArrayMultiDimensionLiteralsBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16711,8 +16711,8 @@ void ArrayMultiDimensionLiteralsBoundedStringPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16731,7 +16731,7 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16755,14 +16755,14 @@ bool ArrayMultiDimensionLiteralsBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16795,18 +16795,18 @@ ArrayMultiDimensionLiteralsBoundedWStringPubSubType::~ArrayMultiDimensionLiteral bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16825,12 +16825,12 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16839,14 +16839,14 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::deserialize( ArrayMultiDimensionLiteralsBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16891,8 +16891,8 @@ void ArrayMultiDimensionLiteralsBoundedWStringPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16911,7 +16911,7 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16935,14 +16935,14 @@ bool ArrayMultiDimensionLiteralsBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16975,18 +16975,18 @@ ArrayMultiDimensionLiteralsEnumPubSubType::~ArrayMultiDimensionLiteralsEnumPubSu bool ArrayMultiDimensionLiteralsEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17005,12 +17005,12 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17019,14 +17019,14 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::deserialize( ArrayMultiDimensionLiteralsEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17071,8 +17071,8 @@ void ArrayMultiDimensionLiteralsEnumPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17091,7 +17091,7 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17115,14 +17115,14 @@ bool ArrayMultiDimensionLiteralsEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17155,18 +17155,18 @@ ArrayMultiDimensionLiteralsBitMaskPubSubType::~ArrayMultiDimensionLiteralsBitMas bool ArrayMultiDimensionLiteralsBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17185,12 +17185,12 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17199,14 +17199,14 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::deserialize( ArrayMultiDimensionLiteralsBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17251,8 +17251,8 @@ void ArrayMultiDimensionLiteralsBitMaskPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17271,7 +17271,7 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17295,14 +17295,14 @@ bool ArrayMultiDimensionLiteralsBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17335,18 +17335,18 @@ ArrayMultiDimensionLiteralsAliasPubSubType::~ArrayMultiDimensionLiteralsAliasPub bool ArrayMultiDimensionLiteralsAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17365,12 +17365,12 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17379,14 +17379,14 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::deserialize( ArrayMultiDimensionLiteralsAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17431,8 +17431,8 @@ void ArrayMultiDimensionLiteralsAliasPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17451,7 +17451,7 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17475,14 +17475,14 @@ bool ArrayMultiDimensionLiteralsAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17515,18 +17515,18 @@ ArrayMultiDimensionLiteralsSequencePubSubType::~ArrayMultiDimensionLiteralsSeque bool ArrayMultiDimensionLiteralsSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17545,12 +17545,12 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17559,14 +17559,14 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::deserialize( ArrayMultiDimensionLiteralsSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17611,8 +17611,8 @@ void ArrayMultiDimensionLiteralsSequencePubSubType::delete_data( } bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17631,7 +17631,7 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17655,14 +17655,14 @@ bool ArrayMultiDimensionLiteralsSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17695,18 +17695,18 @@ ArrayMultiDimensionLiteralsMapPubSubType::~ArrayMultiDimensionLiteralsMapPubSubT bool ArrayMultiDimensionLiteralsMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17725,12 +17725,12 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17739,14 +17739,14 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::deserialize( ArrayMultiDimensionLiteralsMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17791,8 +17791,8 @@ void ArrayMultiDimensionLiteralsMapPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17811,7 +17811,7 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17835,14 +17835,14 @@ bool ArrayMultiDimensionLiteralsMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17875,18 +17875,18 @@ ArrayMultiDimensionLiteralsUnionPubSubType::~ArrayMultiDimensionLiteralsUnionPub bool ArrayMultiDimensionLiteralsUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17905,12 +17905,12 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17919,14 +17919,14 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::deserialize( ArrayMultiDimensionLiteralsUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17971,8 +17971,8 @@ void ArrayMultiDimensionLiteralsUnionPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17991,7 +17991,7 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18015,14 +18015,14 @@ bool ArrayMultiDimensionLiteralsUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18055,18 +18055,18 @@ ArrayMultiDimensionLiteralsStructurePubSubType::~ArrayMultiDimensionLiteralsStru bool ArrayMultiDimensionLiteralsStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18085,12 +18085,12 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18099,14 +18099,14 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::deserialize( ArrayMultiDimensionLiteralsStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18151,8 +18151,8 @@ void ArrayMultiDimensionLiteralsStructurePubSubType::delete_data( } bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18171,7 +18171,7 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18195,14 +18195,14 @@ bool ArrayMultiDimensionLiteralsStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18235,18 +18235,18 @@ ArrayMultiDimensionLiteralsBitSetPubSubType::~ArrayMultiDimensionLiteralsBitSetP bool ArrayMultiDimensionLiteralsBitSetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayMultiDimensionLiteralsBitSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18265,12 +18265,12 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayMultiDimensionLiteralsBitSetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18279,14 +18279,14 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::deserialize( ArrayMultiDimensionLiteralsBitSet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18331,8 +18331,8 @@ void ArrayMultiDimensionLiteralsBitSetPubSubType::delete_data( } bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18351,7 +18351,7 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18375,14 +18375,14 @@ bool ArrayMultiDimensionLiteralsBitSetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18415,18 +18415,18 @@ BoundedSmallArraysPubSubType::~BoundedSmallArraysPubSubType() bool BoundedSmallArraysPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedSmallArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18445,12 +18445,12 @@ bool BoundedSmallArraysPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedSmallArraysPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18459,14 +18459,14 @@ bool BoundedSmallArraysPubSubType::deserialize( BoundedSmallArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18511,8 +18511,8 @@ void BoundedSmallArraysPubSubType::delete_data( } bool BoundedSmallArraysPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18531,7 +18531,7 @@ bool BoundedSmallArraysPubSubType::compute_key( bool BoundedSmallArraysPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18555,14 +18555,14 @@ bool BoundedSmallArraysPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18595,18 +18595,18 @@ BoundedBigArraysPubSubType::~BoundedBigArraysPubSubType() bool BoundedBigArraysPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedBigArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18625,12 +18625,12 @@ bool BoundedBigArraysPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedBigArraysPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18639,14 +18639,14 @@ bool BoundedBigArraysPubSubType::deserialize( BoundedBigArrays* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18691,8 +18691,8 @@ void BoundedBigArraysPubSubType::delete_data( } bool BoundedBigArraysPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18711,7 +18711,7 @@ bool BoundedBigArraysPubSubType::compute_key( bool BoundedBigArraysPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18735,14 +18735,14 @@ bool BoundedBigArraysPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index 5e85e313c43..21d2905ee2d 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -55,11 +55,11 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2267,11 +2267,11 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2279,13 +2279,13 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2346,11 +2346,11 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2358,13 +2358,13 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2425,11 +2425,11 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2437,13 +2437,13 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2504,11 +2504,11 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2516,13 +2516,13 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2583,11 +2583,11 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2595,13 +2595,13 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2662,11 +2662,11 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2674,13 +2674,13 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2741,11 +2741,11 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2753,13 +2753,13 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2820,11 +2820,11 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2832,13 +2832,13 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2899,11 +2899,11 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2911,13 +2911,13 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2978,11 +2978,11 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2990,13 +2990,13 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3057,11 +3057,11 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3069,13 +3069,13 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3136,11 +3136,11 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3148,13 +3148,13 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3215,11 +3215,11 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3227,13 +3227,13 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3294,11 +3294,11 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3306,13 +3306,13 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3373,11 +3373,11 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3385,13 +3385,13 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3452,11 +3452,11 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3464,13 +3464,13 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3531,11 +3531,11 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3543,13 +3543,13 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3610,11 +3610,11 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3622,13 +3622,13 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3689,11 +3689,11 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3701,13 +3701,13 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3768,11 +3768,11 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3780,13 +3780,13 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3847,11 +3847,11 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3859,13 +3859,13 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3926,11 +3926,11 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3938,13 +3938,13 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4005,11 +4005,11 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4017,13 +4017,13 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4086,11 +4086,11 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4098,13 +4098,13 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4165,11 +4165,11 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4177,13 +4177,13 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4244,11 +4244,11 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4256,13 +4256,13 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4323,11 +4323,11 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4335,13 +4335,13 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4402,11 +4402,11 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4414,13 +4414,13 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4481,11 +4481,11 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4493,13 +4493,13 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4560,11 +4560,11 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4572,13 +4572,13 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4639,11 +4639,11 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4651,13 +4651,13 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4718,11 +4718,11 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4730,13 +4730,13 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4797,11 +4797,11 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4809,13 +4809,13 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4876,11 +4876,11 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4888,13 +4888,13 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4955,11 +4955,11 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4967,13 +4967,13 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5034,11 +5034,11 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5046,13 +5046,13 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5113,11 +5113,11 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5125,13 +5125,13 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5192,11 +5192,11 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5204,13 +5204,13 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5271,11 +5271,11 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5283,13 +5283,13 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5350,11 +5350,11 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5362,13 +5362,13 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5429,11 +5429,11 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5441,13 +5441,13 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5508,11 +5508,11 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5520,13 +5520,13 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5587,11 +5587,11 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5599,13 +5599,13 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5666,11 +5666,11 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5678,13 +5678,13 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5745,11 +5745,11 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5757,13 +5757,13 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5824,11 +5824,11 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5836,13 +5836,13 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5903,11 +5903,11 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5915,13 +5915,13 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5982,11 +5982,11 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5994,13 +5994,13 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6061,11 +6061,11 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6073,13 +6073,13 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6140,11 +6140,11 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6152,13 +6152,13 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6219,11 +6219,11 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6231,13 +6231,13 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6298,11 +6298,11 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6310,13 +6310,13 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6377,11 +6377,11 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6389,13 +6389,13 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6456,11 +6456,11 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6468,13 +6468,13 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6535,11 +6535,11 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6547,13 +6547,13 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6614,11 +6614,11 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6626,13 +6626,13 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6693,11 +6693,11 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6705,13 +6705,13 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6772,11 +6772,11 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6784,13 +6784,13 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6851,11 +6851,11 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6863,13 +6863,13 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6930,11 +6930,11 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6942,13 +6942,13 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7009,11 +7009,11 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7021,13 +7021,13 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7088,11 +7088,11 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7100,13 +7100,13 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7167,11 +7167,11 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7179,13 +7179,13 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7246,11 +7246,11 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7258,13 +7258,13 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7325,11 +7325,11 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7337,13 +7337,13 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7404,11 +7404,11 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7416,13 +7416,13 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7483,11 +7483,11 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7495,13 +7495,13 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7562,11 +7562,11 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7574,13 +7574,13 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7641,11 +7641,11 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7653,13 +7653,13 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7720,11 +7720,11 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7732,13 +7732,13 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7799,11 +7799,11 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7811,13 +7811,13 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7878,11 +7878,11 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7890,13 +7890,13 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7957,11 +7957,11 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7969,13 +7969,13 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8036,11 +8036,11 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8048,13 +8048,13 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8115,11 +8115,11 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8127,13 +8127,13 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8194,11 +8194,11 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8206,13 +8206,13 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/bitsetsPubSubTypes.cxx b/test/dds-types-test/bitsetsPubSubTypes.cxx index 5c0455a7a23..96ea35e4e60 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.cxx +++ b/test/dds-types-test/bitsetsPubSubTypes.cxx @@ -53,18 +53,18 @@ BitsetStructPubSubType::~BitsetStructPubSubType() bool BitsetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool BitsetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BitsetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool BitsetStructPubSubType::deserialize( BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void BitsetStructPubSubType::delete_data( } bool BitsetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool BitsetStructPubSubType::compute_key( bool BitsetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool BitsetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index 56b038104e8..93cfa50749e 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -55,11 +55,11 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/constantsPubSubTypes.cxx b/test/dds-types-test/constantsPubSubTypes.cxx index f03e4cfc3c3..94a0e0429fe 100644 --- a/test/dds-types-test/constantsPubSubTypes.cxx +++ b/test/dds-types-test/constantsPubSubTypes.cxx @@ -54,18 +54,18 @@ namespace const_module1 { bool ModuleConstsLiteralsStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ModuleConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -84,12 +84,12 @@ namespace const_module1 { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ModuleConstsLiteralsStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -98,14 +98,14 @@ namespace const_module1 { ModuleConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -150,8 +150,8 @@ namespace const_module1 { } bool ModuleConstsLiteralsStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -170,7 +170,7 @@ namespace const_module1 { bool ModuleConstsLiteralsStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -194,14 +194,14 @@ namespace const_module1 { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -237,18 +237,18 @@ namespace const_module2 { bool Module2ConstsLiteralsStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Module2ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -267,12 +267,12 @@ namespace const_module2 { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Module2ConstsLiteralsStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -281,14 +281,14 @@ namespace const_module2 { Module2ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -333,8 +333,8 @@ namespace const_module2 { } bool Module2ConstsLiteralsStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -353,7 +353,7 @@ namespace const_module2 { bool Module2ConstsLiteralsStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -377,14 +377,14 @@ namespace const_module2 { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -419,18 +419,18 @@ ConstsLiteralsStructPubSubType::~ConstsLiteralsStructPubSubType() bool ConstsLiteralsStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -449,12 +449,12 @@ bool ConstsLiteralsStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ConstsLiteralsStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -463,14 +463,14 @@ bool ConstsLiteralsStructPubSubType::deserialize( ConstsLiteralsStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -515,8 +515,8 @@ void ConstsLiteralsStructPubSubType::delete_data( } bool ConstsLiteralsStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -535,7 +535,7 @@ bool ConstsLiteralsStructPubSubType::compute_key( bool ConstsLiteralsStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -559,14 +559,14 @@ bool ConstsLiteralsStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index 9852daa0190..e220029ec8d 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -61,11 +61,11 @@ namespace const_module1 eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -73,13 +73,13 @@ namespace const_module1 eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -143,11 +143,11 @@ namespace const_module2 eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -155,13 +155,13 @@ namespace const_module2 eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -223,11 +223,11 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -235,13 +235,13 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/declarationsPubSubTypes.cxx b/test/dds-types-test/declarationsPubSubTypes.cxx index 505567558b0..80ddc224b57 100644 --- a/test/dds-types-test/declarationsPubSubTypes.cxx +++ b/test/dds-types-test/declarationsPubSubTypes.cxx @@ -51,18 +51,18 @@ ForwardDeclarationsRecursiveStructPubSubType::~ForwardDeclarationsRecursiveStruc bool ForwardDeclarationsRecursiveStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -81,12 +81,12 @@ bool ForwardDeclarationsRecursiveStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ForwardDeclarationsRecursiveStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -95,14 +95,14 @@ bool ForwardDeclarationsRecursiveStructPubSubType::deserialize( ForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -147,8 +147,8 @@ void ForwardDeclarationsRecursiveStructPubSubType::delete_data( } bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -167,7 +167,7 @@ bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -191,14 +191,14 @@ bool ForwardDeclarationsRecursiveStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ForwardStructPubSubType::~ForwardStructPubSubType() bool ForwardStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ForwardStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ForwardStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ForwardStructPubSubType::deserialize( ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ForwardStructPubSubType::delete_data( } bool ForwardStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ForwardStructPubSubType::compute_key( bool ForwardStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ForwardStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -415,18 +415,18 @@ namespace declarations_module { bool ForwardStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -445,12 +445,12 @@ namespace declarations_module { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ForwardStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -459,14 +459,14 @@ namespace declarations_module { ForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -511,8 +511,8 @@ namespace declarations_module { } bool ForwardStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -531,7 +531,7 @@ namespace declarations_module { bool ForwardStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -555,14 +555,14 @@ namespace declarations_module { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -598,18 +598,18 @@ ModuledForwardDeclarationsRecursiveStructPubSubType::~ModuledForwardDeclarations bool ModuledForwardDeclarationsRecursiveStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ModuledForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -628,12 +628,12 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ModuledForwardDeclarationsRecursiveStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -642,14 +642,14 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::deserialize( ModuledForwardDeclarationsRecursiveStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -694,8 +694,8 @@ void ModuledForwardDeclarationsRecursiveStructPubSubType::delete_data( } bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -714,7 +714,7 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -738,14 +738,14 @@ bool ModuledForwardDeclarationsRecursiveStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -780,18 +780,18 @@ namespace declarations_module { bool ModuledForwardStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ModuledForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -810,12 +810,12 @@ namespace declarations_module { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ModuledForwardStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -824,14 +824,14 @@ namespace declarations_module { ModuledForwardStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -876,8 +876,8 @@ namespace declarations_module { } bool ModuledForwardStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -896,7 +896,7 @@ namespace declarations_module { bool ModuledForwardStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -920,14 +920,14 @@ namespace declarations_module { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -965,18 +965,18 @@ ModuledCommonNameStructurePubSubType::~ModuledCommonNameStructurePubSubType() bool ModuledCommonNameStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ModuledCommonNameStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -995,12 +995,12 @@ bool ModuledCommonNameStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ModuledCommonNameStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1009,14 +1009,14 @@ bool ModuledCommonNameStructurePubSubType::deserialize( ModuledCommonNameStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1061,8 +1061,8 @@ void ModuledCommonNameStructurePubSubType::delete_data( } bool ModuledCommonNameStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1081,7 +1081,7 @@ bool ModuledCommonNameStructurePubSubType::compute_key( bool ModuledCommonNameStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1105,14 +1105,14 @@ bool ModuledCommonNameStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index f725b905ddf..c649ac154cb 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -59,11 +59,11 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -71,13 +71,13 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -139,11 +139,11 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -151,13 +151,13 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -224,11 +224,11 @@ namespace declarations_module eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -236,13 +236,13 @@ namespace declarations_module eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -304,11 +304,11 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -316,13 +316,13 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -385,11 +385,11 @@ namespace declarations_module eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -397,13 +397,13 @@ namespace declarations_module eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -467,11 +467,11 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -479,13 +479,13 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/enumerationsPubSubTypes.cxx b/test/dds-types-test/enumerationsPubSubTypes.cxx index 407ea9ec989..9793e3907ad 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.cxx +++ b/test/dds-types-test/enumerationsPubSubTypes.cxx @@ -56,18 +56,18 @@ EnumStructurePubSubType::~EnumStructurePubSubType() bool EnumStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EnumStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -86,12 +86,12 @@ bool EnumStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EnumStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -100,14 +100,14 @@ bool EnumStructurePubSubType::deserialize( EnumStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -152,8 +152,8 @@ void EnumStructurePubSubType::delete_data( } bool EnumStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -172,7 +172,7 @@ bool EnumStructurePubSubType::compute_key( bool EnumStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -196,14 +196,14 @@ bool EnumStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -236,18 +236,18 @@ BitMaskStructurePubSubType::~BitMaskStructurePubSubType() bool BitMaskStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -266,12 +266,12 @@ bool BitMaskStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BitMaskStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -280,14 +280,14 @@ bool BitMaskStructurePubSubType::deserialize( BitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -332,8 +332,8 @@ void BitMaskStructurePubSubType::delete_data( } bool BitMaskStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -352,7 +352,7 @@ bool BitMaskStructurePubSubType::compute_key( bool BitMaskStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -376,14 +376,14 @@ bool BitMaskStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -416,18 +416,18 @@ BoundedBitMaskStructurePubSubType::~BoundedBitMaskStructurePubSubType() bool BoundedBitMaskStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedBitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -446,12 +446,12 @@ bool BoundedBitMaskStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedBitMaskStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -460,14 +460,14 @@ bool BoundedBitMaskStructurePubSubType::deserialize( BoundedBitMaskStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -512,8 +512,8 @@ void BoundedBitMaskStructurePubSubType::delete_data( } bool BoundedBitMaskStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -532,7 +532,7 @@ bool BoundedBitMaskStructurePubSubType::compute_key( bool BoundedBitMaskStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -556,14 +556,14 @@ bool BoundedBitMaskStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index 1e258e34b9a..f748fdb12bd 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -58,11 +58,11 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -70,13 +70,13 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -137,11 +137,11 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -149,13 +149,13 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -216,11 +216,11 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -228,13 +228,13 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/externalPubSubTypes.cxx b/test/dds-types-test/externalPubSubTypes.cxx index 2a8359aa73f..9f2241b0b68 100644 --- a/test/dds-types-test/externalPubSubTypes.cxx +++ b/test/dds-types-test/externalPubSubTypes.cxx @@ -51,18 +51,18 @@ short_externalPubSubType::~short_externalPubSubType() bool short_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -81,12 +81,12 @@ bool short_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool short_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -95,14 +95,14 @@ bool short_externalPubSubType::deserialize( short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -147,8 +147,8 @@ void short_externalPubSubType::delete_data( } bool short_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -167,7 +167,7 @@ bool short_externalPubSubType::compute_key( bool short_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -191,14 +191,14 @@ bool short_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -232,18 +232,18 @@ ushort_externalPubSubType::~ushort_externalPubSubType() bool ushort_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ushort_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -262,12 +262,12 @@ bool ushort_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ushort_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -276,14 +276,14 @@ bool ushort_externalPubSubType::deserialize( ushort_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -328,8 +328,8 @@ void ushort_externalPubSubType::delete_data( } bool ushort_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -348,7 +348,7 @@ bool ushort_externalPubSubType::compute_key( bool ushort_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -372,14 +372,14 @@ bool ushort_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ long_externalPubSubType::~long_externalPubSubType() bool long_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const long_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool long_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool long_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool long_externalPubSubType::deserialize( long_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void long_externalPubSubType::delete_data( } bool long_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool long_externalPubSubType::compute_key( bool long_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool long_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -594,18 +594,18 @@ ulong_externalPubSubType::~ulong_externalPubSubType() bool ulong_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -624,12 +624,12 @@ bool ulong_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulong_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -638,14 +638,14 @@ bool ulong_externalPubSubType::deserialize( ulong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -690,8 +690,8 @@ void ulong_externalPubSubType::delete_data( } bool ulong_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -710,7 +710,7 @@ bool ulong_externalPubSubType::compute_key( bool ulong_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -734,14 +734,14 @@ bool ulong_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -775,18 +775,18 @@ longlong_externalPubSubType::~longlong_externalPubSubType() bool longlong_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longlong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -805,12 +805,12 @@ bool longlong_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longlong_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -819,14 +819,14 @@ bool longlong_externalPubSubType::deserialize( longlong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -871,8 +871,8 @@ void longlong_externalPubSubType::delete_data( } bool longlong_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -891,7 +891,7 @@ bool longlong_externalPubSubType::compute_key( bool longlong_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -915,14 +915,14 @@ bool longlong_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -956,18 +956,18 @@ ulonglong_externalPubSubType::~ulonglong_externalPubSubType() bool ulonglong_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulonglong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -986,12 +986,12 @@ bool ulonglong_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulonglong_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1000,14 +1000,14 @@ bool ulonglong_externalPubSubType::deserialize( ulonglong_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1052,8 +1052,8 @@ void ulonglong_externalPubSubType::delete_data( } bool ulonglong_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1072,7 +1072,7 @@ bool ulonglong_externalPubSubType::compute_key( bool ulonglong_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1096,14 +1096,14 @@ bool ulonglong_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1137,18 +1137,18 @@ float_externalPubSubType::~float_externalPubSubType() bool float_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const float_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1167,12 +1167,12 @@ bool float_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool float_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1181,14 +1181,14 @@ bool float_externalPubSubType::deserialize( float_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1233,8 +1233,8 @@ void float_externalPubSubType::delete_data( } bool float_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1253,7 +1253,7 @@ bool float_externalPubSubType::compute_key( bool float_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1277,14 +1277,14 @@ bool float_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1318,18 +1318,18 @@ double_externalPubSubType::~double_externalPubSubType() bool double_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const double_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1348,12 +1348,12 @@ bool double_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool double_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1362,14 +1362,14 @@ bool double_externalPubSubType::deserialize( double_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1414,8 +1414,8 @@ void double_externalPubSubType::delete_data( } bool double_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1434,7 +1434,7 @@ bool double_externalPubSubType::compute_key( bool double_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1458,14 +1458,14 @@ bool double_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1499,18 +1499,18 @@ longdouble_externalPubSubType::~longdouble_externalPubSubType() bool longdouble_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longdouble_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1529,12 +1529,12 @@ bool longdouble_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longdouble_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1543,14 +1543,14 @@ bool longdouble_externalPubSubType::deserialize( longdouble_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1595,8 +1595,8 @@ void longdouble_externalPubSubType::delete_data( } bool longdouble_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1615,7 +1615,7 @@ bool longdouble_externalPubSubType::compute_key( bool longdouble_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1639,14 +1639,14 @@ bool longdouble_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1680,18 +1680,18 @@ boolean_externalPubSubType::~boolean_externalPubSubType() bool boolean_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const boolean_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1710,12 +1710,12 @@ bool boolean_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool boolean_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1724,14 +1724,14 @@ bool boolean_externalPubSubType::deserialize( boolean_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1776,8 +1776,8 @@ void boolean_externalPubSubType::delete_data( } bool boolean_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1796,7 +1796,7 @@ bool boolean_externalPubSubType::compute_key( bool boolean_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1820,14 +1820,14 @@ bool boolean_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1861,18 +1861,18 @@ octet_externalPubSubType::~octet_externalPubSubType() bool octet_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const octet_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1891,12 +1891,12 @@ bool octet_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool octet_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1905,14 +1905,14 @@ bool octet_externalPubSubType::deserialize( octet_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1957,8 +1957,8 @@ void octet_externalPubSubType::delete_data( } bool octet_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1977,7 +1977,7 @@ bool octet_externalPubSubType::compute_key( bool octet_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2001,14 +2001,14 @@ bool octet_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2042,18 +2042,18 @@ char_externalPubSubType::~char_externalPubSubType() bool char_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const char_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2072,12 +2072,12 @@ bool char_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool char_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2086,14 +2086,14 @@ bool char_externalPubSubType::deserialize( char_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2138,8 +2138,8 @@ void char_externalPubSubType::delete_data( } bool char_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2158,7 +2158,7 @@ bool char_externalPubSubType::compute_key( bool char_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2182,14 +2182,14 @@ bool char_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2223,18 +2223,18 @@ wchar_externalPubSubType::~wchar_externalPubSubType() bool wchar_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const wchar_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2253,12 +2253,12 @@ bool wchar_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool wchar_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2267,14 +2267,14 @@ bool wchar_externalPubSubType::deserialize( wchar_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2319,8 +2319,8 @@ void wchar_externalPubSubType::delete_data( } bool wchar_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2339,7 +2339,7 @@ bool wchar_externalPubSubType::compute_key( bool wchar_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2363,14 +2363,14 @@ bool wchar_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2404,18 +2404,18 @@ sequence_short_externalPubSubType::~sequence_short_externalPubSubType() bool sequence_short_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sequence_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2434,12 +2434,12 @@ bool sequence_short_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool sequence_short_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2448,14 +2448,14 @@ bool sequence_short_externalPubSubType::deserialize( sequence_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2500,8 +2500,8 @@ void sequence_short_externalPubSubType::delete_data( } bool sequence_short_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2520,7 +2520,7 @@ bool sequence_short_externalPubSubType::compute_key( bool sequence_short_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2544,14 +2544,14 @@ bool sequence_short_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2585,18 +2585,18 @@ string_unbounded_externalPubSubType::~string_unbounded_externalPubSubType() bool string_unbounded_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_unbounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2615,12 +2615,12 @@ bool string_unbounded_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_unbounded_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2629,14 +2629,14 @@ bool string_unbounded_externalPubSubType::deserialize( string_unbounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2681,8 +2681,8 @@ void string_unbounded_externalPubSubType::delete_data( } bool string_unbounded_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2701,7 +2701,7 @@ bool string_unbounded_externalPubSubType::compute_key( bool string_unbounded_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2725,14 +2725,14 @@ bool string_unbounded_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2766,18 +2766,18 @@ string_bounded_externalPubSubType::~string_bounded_externalPubSubType() bool string_bounded_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_bounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2796,12 +2796,12 @@ bool string_bounded_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_bounded_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2810,14 +2810,14 @@ bool string_bounded_externalPubSubType::deserialize( string_bounded_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2862,8 +2862,8 @@ void string_bounded_externalPubSubType::delete_data( } bool string_bounded_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2882,7 +2882,7 @@ bool string_bounded_externalPubSubType::compute_key( bool string_bounded_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2906,14 +2906,14 @@ bool string_bounded_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2947,18 +2947,18 @@ map_short_externalPubSubType::~map_short_externalPubSubType() bool map_short_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const map_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2977,12 +2977,12 @@ bool map_short_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool map_short_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2991,14 +2991,14 @@ bool map_short_externalPubSubType::deserialize( map_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3043,8 +3043,8 @@ void map_short_externalPubSubType::delete_data( } bool map_short_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3063,7 +3063,7 @@ bool map_short_externalPubSubType::compute_key( bool map_short_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3087,14 +3087,14 @@ bool map_short_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3128,18 +3128,18 @@ array_short_externalPubSubType::~array_short_externalPubSubType() bool array_short_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const array_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3158,12 +3158,12 @@ bool array_short_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool array_short_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3172,14 +3172,14 @@ bool array_short_externalPubSubType::deserialize( array_short_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3224,8 +3224,8 @@ void array_short_externalPubSubType::delete_data( } bool array_short_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3244,7 +3244,7 @@ bool array_short_externalPubSubType::compute_key( bool array_short_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3268,14 +3268,14 @@ bool array_short_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3309,18 +3309,18 @@ struct_externalPubSubType::~struct_externalPubSubType() bool struct_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3339,12 +3339,12 @@ bool struct_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3353,14 +3353,14 @@ bool struct_externalPubSubType::deserialize( struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3405,8 +3405,8 @@ void struct_externalPubSubType::delete_data( } bool struct_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3425,7 +3425,7 @@ bool struct_externalPubSubType::compute_key( bool struct_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3449,14 +3449,14 @@ bool struct_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3490,18 +3490,18 @@ InnerStructExternalPubSubType::~InnerStructExternalPubSubType() bool InnerStructExternalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructExternal* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3520,12 +3520,12 @@ bool InnerStructExternalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructExternalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3534,14 +3534,14 @@ bool InnerStructExternalPubSubType::deserialize( InnerStructExternal* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3586,8 +3586,8 @@ void InnerStructExternalPubSubType::delete_data( } bool InnerStructExternalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3606,7 +3606,7 @@ bool InnerStructExternalPubSubType::compute_key( bool InnerStructExternalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3630,14 +3630,14 @@ bool InnerStructExternalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3671,18 +3671,18 @@ ext_struct_externalPubSubType::~ext_struct_externalPubSubType() bool ext_struct_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ext_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3701,12 +3701,12 @@ bool ext_struct_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ext_struct_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3715,14 +3715,14 @@ bool ext_struct_externalPubSubType::deserialize( ext_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3767,8 +3767,8 @@ void ext_struct_externalPubSubType::delete_data( } bool ext_struct_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3787,7 +3787,7 @@ bool ext_struct_externalPubSubType::compute_key( bool ext_struct_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3811,14 +3811,14 @@ bool ext_struct_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3852,18 +3852,18 @@ ext_and_inner_struct_externalPubSubType::~ext_and_inner_struct_externalPubSubTyp bool ext_and_inner_struct_externalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ext_and_inner_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3882,12 +3882,12 @@ bool ext_and_inner_struct_externalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ext_and_inner_struct_externalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3896,14 +3896,14 @@ bool ext_and_inner_struct_externalPubSubType::deserialize( ext_and_inner_struct_external* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3948,8 +3948,8 @@ void ext_and_inner_struct_externalPubSubType::delete_data( } bool ext_and_inner_struct_externalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3968,7 +3968,7 @@ bool ext_and_inner_struct_externalPubSubType::compute_key( bool ext_and_inner_struct_externalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3992,14 +3992,14 @@ bool ext_and_inner_struct_externalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4033,18 +4033,18 @@ struct_external_optionalPubSubType::~struct_external_optionalPubSubType() bool struct_external_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_external_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4063,12 +4063,12 @@ bool struct_external_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_external_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4077,14 +4077,14 @@ bool struct_external_optionalPubSubType::deserialize( struct_external_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4129,8 +4129,8 @@ void struct_external_optionalPubSubType::delete_data( } bool struct_external_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4149,7 +4149,7 @@ bool struct_external_optionalPubSubType::compute_key( bool struct_external_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4173,14 +4173,14 @@ bool struct_external_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4215,18 +4215,18 @@ recursive_union_containerPubSubType::~recursive_union_containerPubSubType() bool recursive_union_containerPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const recursive_union_container* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4245,12 +4245,12 @@ bool recursive_union_containerPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool recursive_union_containerPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4259,14 +4259,14 @@ bool recursive_union_containerPubSubType::deserialize( recursive_union_container* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4311,8 +4311,8 @@ void recursive_union_containerPubSubType::delete_data( } bool recursive_union_containerPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4331,7 +4331,7 @@ bool recursive_union_containerPubSubType::compute_key( bool recursive_union_containerPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4355,14 +4355,14 @@ bool recursive_union_containerPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4397,18 +4397,18 @@ recursive_test_1PubSubType::~recursive_test_1PubSubType() bool recursive_test_1PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const recursive_test_1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4427,12 +4427,12 @@ bool recursive_test_1PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool recursive_test_1PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4441,14 +4441,14 @@ bool recursive_test_1PubSubType::deserialize( recursive_test_1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4493,8 +4493,8 @@ void recursive_test_1PubSubType::delete_data( } bool recursive_test_1PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,7 +4513,7 @@ bool recursive_test_1PubSubType::compute_key( bool recursive_test_1PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4537,14 +4537,14 @@ bool recursive_test_1PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4580,18 +4580,18 @@ recursive_structurePubSubType::~recursive_structurePubSubType() bool recursive_structurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const recursive_structure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4610,12 +4610,12 @@ bool recursive_structurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool recursive_structurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4624,14 +4624,14 @@ bool recursive_structurePubSubType::deserialize( recursive_structure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4676,8 +4676,8 @@ void recursive_structurePubSubType::delete_data( } bool recursive_structurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4696,7 +4696,7 @@ bool recursive_structurePubSubType::compute_key( bool recursive_structurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4720,14 +4720,14 @@ bool recursive_structurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4761,18 +4761,18 @@ recursive_test_2PubSubType::~recursive_test_2PubSubType() bool recursive_test_2PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const recursive_test_2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4791,12 +4791,12 @@ bool recursive_test_2PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool recursive_test_2PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4805,14 +4805,14 @@ bool recursive_test_2PubSubType::deserialize( recursive_test_2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4857,8 +4857,8 @@ void recursive_test_2PubSubType::delete_data( } bool recursive_test_2PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4877,7 +4877,7 @@ bool recursive_test_2PubSubType::compute_key( bool recursive_test_2PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4901,14 +4901,14 @@ bool recursive_test_2PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index 981d1db74ce..17fbb0e0fe1 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -55,11 +55,11 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1873,11 +1873,11 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1885,13 +1885,13 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1953,11 +1953,11 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1965,13 +1965,13 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2034,11 +2034,11 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2046,13 +2046,13 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2113,11 +2113,11 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2125,13 +2125,13 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/finalPubSubTypes.cxx b/test/dds-types-test/finalPubSubTypes.cxx index 1c49bea7172..34a346933f5 100644 --- a/test/dds-types-test/finalPubSubTypes.cxx +++ b/test/dds-types-test/finalPubSubTypes.cxx @@ -53,18 +53,18 @@ FinalShortStructPubSubType::~FinalShortStructPubSubType() bool FinalShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool FinalShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool FinalShortStructPubSubType::deserialize( FinalShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void FinalShortStructPubSubType::delete_data( } bool FinalShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool FinalShortStructPubSubType::compute_key( bool FinalShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool FinalShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ FinalUShortStructPubSubType::~FinalUShortStructPubSubType() bool FinalUShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool FinalUShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalUShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool FinalUShortStructPubSubType::deserialize( FinalUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void FinalUShortStructPubSubType::delete_data( } bool FinalUShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool FinalUShortStructPubSubType::compute_key( bool FinalUShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool FinalUShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ FinalLongStructPubSubType::~FinalLongStructPubSubType() bool FinalLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool FinalLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool FinalLongStructPubSubType::deserialize( FinalLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void FinalLongStructPubSubType::delete_data( } bool FinalLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool FinalLongStructPubSubType::compute_key( bool FinalLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool FinalLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ FinalULongStructPubSubType::~FinalULongStructPubSubType() bool FinalULongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool FinalULongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalULongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool FinalULongStructPubSubType::deserialize( FinalULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void FinalULongStructPubSubType::delete_data( } bool FinalULongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool FinalULongStructPubSubType::compute_key( bool FinalULongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool FinalULongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ FinalLongLongStructPubSubType::~FinalLongLongStructPubSubType() bool FinalLongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool FinalLongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalLongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool FinalLongLongStructPubSubType::deserialize( FinalLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void FinalLongLongStructPubSubType::delete_data( } bool FinalLongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool FinalLongLongStructPubSubType::compute_key( bool FinalLongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool FinalLongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ FinalULongLongStructPubSubType::~FinalULongLongStructPubSubType() bool FinalULongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool FinalULongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalULongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool FinalULongLongStructPubSubType::deserialize( FinalULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void FinalULongLongStructPubSubType::delete_data( } bool FinalULongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool FinalULongLongStructPubSubType::compute_key( bool FinalULongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool FinalULongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ FinalFloatStructPubSubType::~FinalFloatStructPubSubType() bool FinalFloatStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool FinalFloatStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalFloatStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool FinalFloatStructPubSubType::deserialize( FinalFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void FinalFloatStructPubSubType::delete_data( } bool FinalFloatStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool FinalFloatStructPubSubType::compute_key( bool FinalFloatStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool FinalFloatStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ FinalDoubleStructPubSubType::~FinalDoubleStructPubSubType() bool FinalDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool FinalDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool FinalDoubleStructPubSubType::deserialize( FinalDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void FinalDoubleStructPubSubType::delete_data( } bool FinalDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool FinalDoubleStructPubSubType::compute_key( bool FinalDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool FinalDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ FinalLongDoubleStructPubSubType::~FinalLongDoubleStructPubSubType() bool FinalLongDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool FinalLongDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalLongDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool FinalLongDoubleStructPubSubType::deserialize( FinalLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void FinalLongDoubleStructPubSubType::delete_data( } bool FinalLongDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool FinalLongDoubleStructPubSubType::compute_key( bool FinalLongDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool FinalLongDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ FinalBooleanStructPubSubType::~FinalBooleanStructPubSubType() bool FinalBooleanStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool FinalBooleanStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalBooleanStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool FinalBooleanStructPubSubType::deserialize( FinalBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void FinalBooleanStructPubSubType::delete_data( } bool FinalBooleanStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool FinalBooleanStructPubSubType::compute_key( bool FinalBooleanStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool FinalBooleanStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ FinalOctetStructPubSubType::~FinalOctetStructPubSubType() bool FinalOctetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool FinalOctetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalOctetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool FinalOctetStructPubSubType::deserialize( FinalOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void FinalOctetStructPubSubType::delete_data( } bool FinalOctetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool FinalOctetStructPubSubType::compute_key( bool FinalOctetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool FinalOctetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ FinalCharStructPubSubType::~FinalCharStructPubSubType() bool FinalCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool FinalCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool FinalCharStructPubSubType::deserialize( FinalCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void FinalCharStructPubSubType::delete_data( } bool FinalCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool FinalCharStructPubSubType::compute_key( bool FinalCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool FinalCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ FinalWCharStructPubSubType::~FinalWCharStructPubSubType() bool FinalWCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool FinalWCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalWCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool FinalWCharStructPubSubType::deserialize( FinalWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void FinalWCharStructPubSubType::delete_data( } bool FinalWCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool FinalWCharStructPubSubType::compute_key( bool FinalWCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool FinalWCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ FinalUnionStructPubSubType::~FinalUnionStructPubSubType() bool FinalUnionStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool FinalUnionStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalUnionStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool FinalUnionStructPubSubType::deserialize( FinalUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void FinalUnionStructPubSubType::delete_data( } bool FinalUnionStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool FinalUnionStructPubSubType::compute_key( bool FinalUnionStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool FinalUnionStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ FinalEmptyStructPubSubType::~FinalEmptyStructPubSubType() bool FinalEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool FinalEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool FinalEmptyStructPubSubType::deserialize( FinalEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void FinalEmptyStructPubSubType::delete_data( } bool FinalEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool FinalEmptyStructPubSubType::compute_key( bool FinalEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool FinalEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ FinalEmptyInheritanceStructPubSubType::~FinalEmptyInheritanceStructPubSubType() bool FinalEmptyInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool FinalEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalEmptyInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool FinalEmptyInheritanceStructPubSubType::deserialize( FinalEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void FinalEmptyInheritanceStructPubSubType::delete_data( } bool FinalEmptyInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool FinalEmptyInheritanceStructPubSubType::compute_key( bool FinalEmptyInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool FinalEmptyInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ FinalInheritanceStructPubSubType::~FinalInheritanceStructPubSubType() bool FinalInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool FinalInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool FinalInheritanceStructPubSubType::deserialize( FinalInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void FinalInheritanceStructPubSubType::delete_data( } bool FinalInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool FinalInheritanceStructPubSubType::compute_key( bool FinalInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool FinalInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ InheritanceEmptyStructPubSubType::~InheritanceEmptyStructPubSubType() bool InheritanceEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool InheritanceEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InheritanceEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool InheritanceEmptyStructPubSubType::deserialize( InheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void InheritanceEmptyStructPubSubType::delete_data( } bool InheritanceEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool InheritanceEmptyStructPubSubType::compute_key( bool InheritanceEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool InheritanceEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ FinalExtensibilityInheritancePubSubType::~FinalExtensibilityInheritancePubSubTyp bool FinalExtensibilityInheritancePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool FinalExtensibilityInheritancePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalExtensibilityInheritancePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool FinalExtensibilityInheritancePubSubType::deserialize( FinalExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void FinalExtensibilityInheritancePubSubType::delete_data( } bool FinalExtensibilityInheritancePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool FinalExtensibilityInheritancePubSubType::compute_key( bool FinalExtensibilityInheritancePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool FinalExtensibilityInheritancePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index c760497ec7a..d6a0bc530a6 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -88,11 +88,11 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -100,13 +100,13 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -222,11 +222,11 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -234,13 +234,13 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -356,11 +356,11 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -368,13 +368,13 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -490,11 +490,11 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -502,13 +502,13 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -624,11 +624,11 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -636,13 +636,13 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -758,11 +758,11 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -770,13 +770,13 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -892,11 +892,11 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -904,13 +904,13 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1026,11 +1026,11 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1038,13 +1038,13 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1160,11 +1160,11 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1172,13 +1172,13 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1294,11 +1294,11 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1306,13 +1306,13 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1428,11 +1428,11 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1440,13 +1440,13 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1562,11 +1562,11 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1574,13 +1574,13 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1696,11 +1696,11 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1708,13 +1708,13 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1797,11 +1797,11 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1809,13 +1809,13 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1876,11 +1876,11 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1888,13 +1888,13 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1973,11 +1973,11 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1985,13 +1985,13 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2052,11 +2052,11 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2064,13 +2064,13 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2131,11 +2131,11 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2143,13 +2143,13 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2265,11 +2265,11 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2277,13 +2277,13 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx index 56ea44e407f..36136420e93 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx @@ -53,18 +53,18 @@ InnerStructureHelperPubSubType::~InnerStructureHelperPubSubType() bool InnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool InnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool InnerStructureHelperPubSubType::deserialize( InnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void InnerStructureHelperPubSubType::delete_data( } bool InnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool InnerStructureHelperPubSubType::compute_key( bool InnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool InnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ InnerEmptyStructureHelperPubSubType::~InnerEmptyStructureHelperPubSubType() bool InnerEmptyStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerEmptyStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool InnerEmptyStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerEmptyStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool InnerEmptyStructureHelperPubSubType::deserialize( InnerEmptyStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void InnerEmptyStructureHelperPubSubType::delete_data( } bool InnerEmptyStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool InnerEmptyStructureHelperPubSubType::compute_key( bool InnerEmptyStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool InnerEmptyStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index a5f76bb8d39..b7c51842714 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -55,11 +55,11 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/inheritancePubSubTypes.cxx b/test/dds-types-test/inheritancePubSubTypes.cxx index dca7d0dc9c1..3e104853aff 100644 --- a/test/dds-types-test/inheritancePubSubTypes.cxx +++ b/test/dds-types-test/inheritancePubSubTypes.cxx @@ -53,18 +53,18 @@ InnerStructureHelperChildPubSubType::~InnerStructureHelperChildPubSubType() bool InnerStructureHelperChildPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool InnerStructureHelperChildPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructureHelperChildPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool InnerStructureHelperChildPubSubType::deserialize( InnerStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void InnerStructureHelperChildPubSubType::delete_data( } bool InnerStructureHelperChildPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool InnerStructureHelperChildPubSubType::compute_key( bool InnerStructureHelperChildPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool InnerStructureHelperChildPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ InnerStructureHelperChildChildPubSubType::~InnerStructureHelperChildChildPubSubT bool InnerStructureHelperChildChildPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructureHelperChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool InnerStructureHelperChildChildPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructureHelperChildChildPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool InnerStructureHelperChildChildPubSubType::deserialize( InnerStructureHelperChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void InnerStructureHelperChildChildPubSubType::delete_data( } bool InnerStructureHelperChildChildPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool InnerStructureHelperChildChildPubSubType::compute_key( bool InnerStructureHelperChildChildPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool InnerStructureHelperChildChildPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ InnerStructureHelperEmptyChildPubSubType::~InnerStructureHelperEmptyChildPubSubT bool InnerStructureHelperEmptyChildPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructureHelperEmptyChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool InnerStructureHelperEmptyChildPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructureHelperEmptyChildPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool InnerStructureHelperEmptyChildPubSubType::deserialize( InnerStructureHelperEmptyChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void InnerStructureHelperEmptyChildPubSubType::delete_data( } bool InnerStructureHelperEmptyChildPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool InnerStructureHelperEmptyChildPubSubType::compute_key( bool InnerStructureHelperEmptyChildPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool InnerStructureHelperEmptyChildPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ InnerStructureHelperEmptyChildChildPubSubType::~InnerStructureHelperEmptyChildCh bool InnerStructureHelperEmptyChildChildPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructureHelperEmptyChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool InnerStructureHelperEmptyChildChildPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructureHelperEmptyChildChildPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool InnerStructureHelperEmptyChildChildPubSubType::deserialize( InnerStructureHelperEmptyChildChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void InnerStructureHelperEmptyChildChildPubSubType::delete_data( } bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool InnerStructureHelperEmptyChildChildPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ InnerEmptyStructureHelperChildPubSubType::~InnerEmptyStructureHelperChildPubSubT bool InnerEmptyStructureHelperChildPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerEmptyStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool InnerEmptyStructureHelperChildPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerEmptyStructureHelperChildPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool InnerEmptyStructureHelperChildPubSubType::deserialize( InnerEmptyStructureHelperChild* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void InnerEmptyStructureHelperChildPubSubType::delete_data( } bool InnerEmptyStructureHelperChildPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool InnerEmptyStructureHelperChildPubSubType::compute_key( bool InnerEmptyStructureHelperChildPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool InnerEmptyStructureHelperChildPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ StructAliasInheritanceStructPubSubType::~StructAliasInheritanceStructPubSubType( bool StructAliasInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructAliasInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool StructAliasInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructAliasInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool StructAliasInheritanceStructPubSubType::deserialize( StructAliasInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void StructAliasInheritanceStructPubSubType::delete_data( } bool StructAliasInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool StructAliasInheritanceStructPubSubType::compute_key( bool StructAliasInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool StructAliasInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ StructuresInheritanceStructPubSubType::~StructuresInheritanceStructPubSubType() bool StructuresInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructuresInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool StructuresInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructuresInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool StructuresInheritanceStructPubSubType::deserialize( StructuresInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void StructuresInheritanceStructPubSubType::delete_data( } bool StructuresInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool StructuresInheritanceStructPubSubType::compute_key( bool StructuresInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool StructuresInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1316,18 +1316,18 @@ BitsetsChildInheritanceStructPubSubType::~BitsetsChildInheritanceStructPubSubTyp bool BitsetsChildInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BitsetsChildInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1346,12 +1346,12 @@ bool BitsetsChildInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BitsetsChildInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1360,14 +1360,14 @@ bool BitsetsChildInheritanceStructPubSubType::deserialize( BitsetsChildInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1412,8 +1412,8 @@ void BitsetsChildInheritanceStructPubSubType::delete_data( } bool BitsetsChildInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1432,7 +1432,7 @@ bool BitsetsChildInheritanceStructPubSubType::compute_key( bool BitsetsChildInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1456,14 +1456,14 @@ bool BitsetsChildInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index fd7c0ea2e91..7591d16ff6b 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -55,11 +55,11 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -611,11 +611,11 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -623,13 +623,13 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/keyPubSubTypes.cxx b/test/dds-types-test/keyPubSubTypes.cxx index 5f9d64a6c8f..1d0ca1670ae 100644 --- a/test/dds-types-test/keyPubSubTypes.cxx +++ b/test/dds-types-test/keyPubSubTypes.cxx @@ -53,18 +53,18 @@ KeyedShortStructPubSubType::~KeyedShortStructPubSubType() bool KeyedShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool KeyedShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool KeyedShortStructPubSubType::deserialize( KeyedShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void KeyedShortStructPubSubType::delete_data( } bool KeyedShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool KeyedShortStructPubSubType::compute_key( bool KeyedShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool KeyedShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ KeyedUShortStructPubSubType::~KeyedUShortStructPubSubType() bool KeyedUShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool KeyedUShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedUShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool KeyedUShortStructPubSubType::deserialize( KeyedUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void KeyedUShortStructPubSubType::delete_data( } bool KeyedUShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool KeyedUShortStructPubSubType::compute_key( bool KeyedUShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool KeyedUShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ KeyedLongStructPubSubType::~KeyedLongStructPubSubType() bool KeyedLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool KeyedLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool KeyedLongStructPubSubType::deserialize( KeyedLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void KeyedLongStructPubSubType::delete_data( } bool KeyedLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool KeyedLongStructPubSubType::compute_key( bool KeyedLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool KeyedLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ KeyedULongStructPubSubType::~KeyedULongStructPubSubType() bool KeyedULongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool KeyedULongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedULongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool KeyedULongStructPubSubType::deserialize( KeyedULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void KeyedULongStructPubSubType::delete_data( } bool KeyedULongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool KeyedULongStructPubSubType::compute_key( bool KeyedULongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool KeyedULongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ KeyedLongLongStructPubSubType::~KeyedLongLongStructPubSubType() bool KeyedLongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool KeyedLongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedLongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool KeyedLongLongStructPubSubType::deserialize( KeyedLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void KeyedLongLongStructPubSubType::delete_data( } bool KeyedLongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool KeyedLongLongStructPubSubType::compute_key( bool KeyedLongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool KeyedLongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ KeyedULongLongStructPubSubType::~KeyedULongLongStructPubSubType() bool KeyedULongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool KeyedULongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedULongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool KeyedULongLongStructPubSubType::deserialize( KeyedULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void KeyedULongLongStructPubSubType::delete_data( } bool KeyedULongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool KeyedULongLongStructPubSubType::compute_key( bool KeyedULongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool KeyedULongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ KeyedFloatStructPubSubType::~KeyedFloatStructPubSubType() bool KeyedFloatStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool KeyedFloatStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedFloatStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool KeyedFloatStructPubSubType::deserialize( KeyedFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void KeyedFloatStructPubSubType::delete_data( } bool KeyedFloatStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool KeyedFloatStructPubSubType::compute_key( bool KeyedFloatStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool KeyedFloatStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ KeyedDoubleStructPubSubType::~KeyedDoubleStructPubSubType() bool KeyedDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool KeyedDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool KeyedDoubleStructPubSubType::deserialize( KeyedDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void KeyedDoubleStructPubSubType::delete_data( } bool KeyedDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool KeyedDoubleStructPubSubType::compute_key( bool KeyedDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool KeyedDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ KeyedLongDoubleStructPubSubType::~KeyedLongDoubleStructPubSubType() bool KeyedLongDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool KeyedLongDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedLongDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool KeyedLongDoubleStructPubSubType::deserialize( KeyedLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void KeyedLongDoubleStructPubSubType::delete_data( } bool KeyedLongDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool KeyedLongDoubleStructPubSubType::compute_key( bool KeyedLongDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool KeyedLongDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ KeyedBooleanStructPubSubType::~KeyedBooleanStructPubSubType() bool KeyedBooleanStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool KeyedBooleanStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedBooleanStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool KeyedBooleanStructPubSubType::deserialize( KeyedBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void KeyedBooleanStructPubSubType::delete_data( } bool KeyedBooleanStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool KeyedBooleanStructPubSubType::compute_key( bool KeyedBooleanStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool KeyedBooleanStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ KeyedOctetStructPubSubType::~KeyedOctetStructPubSubType() bool KeyedOctetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool KeyedOctetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedOctetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool KeyedOctetStructPubSubType::deserialize( KeyedOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void KeyedOctetStructPubSubType::delete_data( } bool KeyedOctetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool KeyedOctetStructPubSubType::compute_key( bool KeyedOctetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool KeyedOctetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ KeyedCharStructPubSubType::~KeyedCharStructPubSubType() bool KeyedCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool KeyedCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool KeyedCharStructPubSubType::deserialize( KeyedCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void KeyedCharStructPubSubType::delete_data( } bool KeyedCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool KeyedCharStructPubSubType::compute_key( bool KeyedCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool KeyedCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ KeyedWCharStructPubSubType::~KeyedWCharStructPubSubType() bool KeyedWCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool KeyedWCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedWCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool KeyedWCharStructPubSubType::deserialize( KeyedWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void KeyedWCharStructPubSubType::delete_data( } bool KeyedWCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool KeyedWCharStructPubSubType::compute_key( bool KeyedWCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool KeyedWCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ KeyedEmptyStructPubSubType::~KeyedEmptyStructPubSubType() bool KeyedEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool KeyedEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool KeyedEmptyStructPubSubType::deserialize( KeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void KeyedEmptyStructPubSubType::delete_data( } bool KeyedEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool KeyedEmptyStructPubSubType::compute_key( bool KeyedEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool KeyedEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ KeyedEmptyInheritanceStructPubSubType::~KeyedEmptyInheritanceStructPubSubType() bool KeyedEmptyInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool KeyedEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedEmptyInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool KeyedEmptyInheritanceStructPubSubType::deserialize( KeyedEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void KeyedEmptyInheritanceStructPubSubType::delete_data( } bool KeyedEmptyInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool KeyedEmptyInheritanceStructPubSubType::compute_key( bool KeyedEmptyInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool KeyedEmptyInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ KeyedInheritanceStructPubSubType::~KeyedInheritanceStructPubSubType() bool KeyedInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyedInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool KeyedInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyedInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool KeyedInheritanceStructPubSubType::deserialize( KeyedInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void KeyedInheritanceStructPubSubType::delete_data( } bool KeyedInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool KeyedInheritanceStructPubSubType::compute_key( bool KeyedInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool KeyedInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ InheritanceKeyedEmptyStructPubSubType::~InheritanceKeyedEmptyStructPubSubType() bool InheritanceKeyedEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InheritanceKeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool InheritanceKeyedEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InheritanceKeyedEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool InheritanceKeyedEmptyStructPubSubType::deserialize( InheritanceKeyedEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void InheritanceKeyedEmptyStructPubSubType::delete_data( } bool InheritanceKeyedEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool InheritanceKeyedEmptyStructPubSubType::compute_key( bool InheritanceKeyedEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool InheritanceKeyedEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index 396fc027302..c0622681173 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -54,11 +54,11 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -291,11 +291,11 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -303,13 +303,13 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -370,11 +370,11 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -382,13 +382,13 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -449,11 +449,11 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -461,13 +461,13 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -528,11 +528,11 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -540,13 +540,13 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -607,11 +607,11 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -619,13 +619,13 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -686,11 +686,11 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -698,13 +698,13 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -765,11 +765,11 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -777,13 +777,13 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -844,11 +844,11 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -856,13 +856,13 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -923,11 +923,11 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -935,13 +935,13 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1002,11 +1002,11 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1014,13 +1014,13 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1081,11 +1081,11 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1093,13 +1093,13 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1160,11 +1160,11 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1172,13 +1172,13 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1239,11 +1239,11 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1251,13 +1251,13 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1318,11 +1318,11 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1330,13 +1330,13 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/mapsPubSubTypes.cxx b/test/dds-types-test/mapsPubSubTypes.cxx index 0942be11fb1..7652da364df 100644 --- a/test/dds-types-test/mapsPubSubTypes.cxx +++ b/test/dds-types-test/mapsPubSubTypes.cxx @@ -53,18 +53,18 @@ MapShortShortPubSubType::~MapShortShortPubSubType() bool MapShortShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool MapShortShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool MapShortShortPubSubType::deserialize( MapShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void MapShortShortPubSubType::delete_data( } bool MapShortShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool MapShortShortPubSubType::compute_key( bool MapShortShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool MapShortShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ MapShortUShortPubSubType::~MapShortUShortPubSubType() bool MapShortUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool MapShortUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool MapShortUShortPubSubType::deserialize( MapShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void MapShortUShortPubSubType::delete_data( } bool MapShortUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool MapShortUShortPubSubType::compute_key( bool MapShortUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool MapShortUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ MapShortLongPubSubType::~MapShortLongPubSubType() bool MapShortLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool MapShortLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool MapShortLongPubSubType::deserialize( MapShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void MapShortLongPubSubType::delete_data( } bool MapShortLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool MapShortLongPubSubType::compute_key( bool MapShortLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool MapShortLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ MapShortULongPubSubType::~MapShortULongPubSubType() bool MapShortULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool MapShortULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool MapShortULongPubSubType::deserialize( MapShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void MapShortULongPubSubType::delete_data( } bool MapShortULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool MapShortULongPubSubType::compute_key( bool MapShortULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool MapShortULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ MapShortLongLongPubSubType::~MapShortLongLongPubSubType() bool MapShortLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool MapShortLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool MapShortLongLongPubSubType::deserialize( MapShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void MapShortLongLongPubSubType::delete_data( } bool MapShortLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool MapShortLongLongPubSubType::compute_key( bool MapShortLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool MapShortLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ MapShortULongLongPubSubType::~MapShortULongLongPubSubType() bool MapShortULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool MapShortULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool MapShortULongLongPubSubType::deserialize( MapShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void MapShortULongLongPubSubType::delete_data( } bool MapShortULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool MapShortULongLongPubSubType::compute_key( bool MapShortULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool MapShortULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ MapShortFloatPubSubType::~MapShortFloatPubSubType() bool MapShortFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool MapShortFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool MapShortFloatPubSubType::deserialize( MapShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void MapShortFloatPubSubType::delete_data( } bool MapShortFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool MapShortFloatPubSubType::compute_key( bool MapShortFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool MapShortFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ MapShortDoublePubSubType::~MapShortDoublePubSubType() bool MapShortDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool MapShortDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool MapShortDoublePubSubType::deserialize( MapShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void MapShortDoublePubSubType::delete_data( } bool MapShortDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool MapShortDoublePubSubType::compute_key( bool MapShortDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool MapShortDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ MapShortLongDoublePubSubType::~MapShortLongDoublePubSubType() bool MapShortLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool MapShortLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool MapShortLongDoublePubSubType::deserialize( MapShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void MapShortLongDoublePubSubType::delete_data( } bool MapShortLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool MapShortLongDoublePubSubType::compute_key( bool MapShortLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool MapShortLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ MapShortBooleanPubSubType::~MapShortBooleanPubSubType() bool MapShortBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool MapShortBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool MapShortBooleanPubSubType::deserialize( MapShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void MapShortBooleanPubSubType::delete_data( } bool MapShortBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool MapShortBooleanPubSubType::compute_key( bool MapShortBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool MapShortBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ MapShortOctetPubSubType::~MapShortOctetPubSubType() bool MapShortOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool MapShortOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool MapShortOctetPubSubType::deserialize( MapShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void MapShortOctetPubSubType::delete_data( } bool MapShortOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool MapShortOctetPubSubType::compute_key( bool MapShortOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool MapShortOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ MapShortCharPubSubType::~MapShortCharPubSubType() bool MapShortCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool MapShortCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool MapShortCharPubSubType::deserialize( MapShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void MapShortCharPubSubType::delete_data( } bool MapShortCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool MapShortCharPubSubType::compute_key( bool MapShortCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool MapShortCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ MapShortWCharPubSubType::~MapShortWCharPubSubType() bool MapShortWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool MapShortWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool MapShortWCharPubSubType::deserialize( MapShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void MapShortWCharPubSubType::delete_data( } bool MapShortWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool MapShortWCharPubSubType::compute_key( bool MapShortWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool MapShortWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ MapShortStringPubSubType::~MapShortStringPubSubType() bool MapShortStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool MapShortStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool MapShortStringPubSubType::deserialize( MapShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void MapShortStringPubSubType::delete_data( } bool MapShortStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool MapShortStringPubSubType::compute_key( bool MapShortStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool MapShortStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ MapShortWStringPubSubType::~MapShortWStringPubSubType() bool MapShortWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool MapShortWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool MapShortWStringPubSubType::deserialize( MapShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void MapShortWStringPubSubType::delete_data( } bool MapShortWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool MapShortWStringPubSubType::compute_key( bool MapShortWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool MapShortWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ MapShortInnerAliasBoundedStringHelperPubSubType::~MapShortInnerAliasBoundedStrin bool MapShortInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::deserialize( MapShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void MapShortInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool MapShortInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ MapShortInnerAliasBoundedWStringHelperPubSubType::~MapShortInnerAliasBoundedWStr bool MapShortInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::deserialize( MapShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void MapShortInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool MapShortInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ MapShortInnerEnumHelperPubSubType::~MapShortInnerEnumHelperPubSubType() bool MapShortInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool MapShortInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool MapShortInnerEnumHelperPubSubType::deserialize( MapShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void MapShortInnerEnumHelperPubSubType::delete_data( } bool MapShortInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool MapShortInnerEnumHelperPubSubType::compute_key( bool MapShortInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool MapShortInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ MapShortInnerBitMaskHelperPubSubType::~MapShortInnerBitMaskHelperPubSubType() bool MapShortInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool MapShortInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool MapShortInnerBitMaskHelperPubSubType::deserialize( MapShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void MapShortInnerBitMaskHelperPubSubType::delete_data( } bool MapShortInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool MapShortInnerBitMaskHelperPubSubType::compute_key( bool MapShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool MapShortInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ MapShortInnerAliasHelperPubSubType::~MapShortInnerAliasHelperPubSubType() bool MapShortInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool MapShortInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool MapShortInnerAliasHelperPubSubType::deserialize( MapShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void MapShortInnerAliasHelperPubSubType::delete_data( } bool MapShortInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool MapShortInnerAliasHelperPubSubType::compute_key( bool MapShortInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool MapShortInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ MapShortInnerAliasArrayHelperPubSubType::~MapShortInnerAliasArrayHelperPubSubTyp bool MapShortInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool MapShortInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool MapShortInnerAliasArrayHelperPubSubType::deserialize( MapShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void MapShortInnerAliasArrayHelperPubSubType::delete_data( } bool MapShortInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool MapShortInnerAliasArrayHelperPubSubType::compute_key( bool MapShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool MapShortInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ MapShortInnerAliasSequenceHelperPubSubType::~MapShortInnerAliasSequenceHelperPub bool MapShortInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool MapShortInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool MapShortInnerAliasSequenceHelperPubSubType::deserialize( MapShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void MapShortInnerAliasSequenceHelperPubSubType::delete_data( } bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool MapShortInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ MapShortInnerAliasMapHelperPubSubType::~MapShortInnerAliasMapHelperPubSubType() bool MapShortInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool MapShortInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool MapShortInnerAliasMapHelperPubSubType::deserialize( MapShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void MapShortInnerAliasMapHelperPubSubType::delete_data( } bool MapShortInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool MapShortInnerAliasMapHelperPubSubType::compute_key( bool MapShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool MapShortInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ MapShortInnerUnionHelperPubSubType::~MapShortInnerUnionHelperPubSubType() bool MapShortInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool MapShortInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool MapShortInnerUnionHelperPubSubType::deserialize( MapShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void MapShortInnerUnionHelperPubSubType::delete_data( } bool MapShortInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool MapShortInnerUnionHelperPubSubType::compute_key( bool MapShortInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool MapShortInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ MapShortInnerStructureHelperPubSubType::~MapShortInnerStructureHelperPubSubType( bool MapShortInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool MapShortInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool MapShortInnerStructureHelperPubSubType::deserialize( MapShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void MapShortInnerStructureHelperPubSubType::delete_data( } bool MapShortInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool MapShortInnerStructureHelperPubSubType::compute_key( bool MapShortInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool MapShortInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ MapShortInnerBitsetHelperPubSubType::~MapShortInnerBitsetHelperPubSubType() bool MapShortInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool MapShortInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapShortInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool MapShortInnerBitsetHelperPubSubType::deserialize( MapShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void MapShortInnerBitsetHelperPubSubType::delete_data( } bool MapShortInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool MapShortInnerBitsetHelperPubSubType::compute_key( bool MapShortInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool MapShortInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ MapUShortShortPubSubType::~MapUShortShortPubSubType() bool MapUShortShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool MapUShortShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool MapUShortShortPubSubType::deserialize( MapUShortShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void MapUShortShortPubSubType::delete_data( } bool MapUShortShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool MapUShortShortPubSubType::compute_key( bool MapUShortShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool MapUShortShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ MapUShortUShortPubSubType::~MapUShortUShortPubSubType() bool MapUShortUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool MapUShortUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool MapUShortUShortPubSubType::deserialize( MapUShortUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void MapUShortUShortPubSubType::delete_data( } bool MapUShortUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool MapUShortUShortPubSubType::compute_key( bool MapUShortUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool MapUShortUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5093,18 +5093,18 @@ MapUShortLongPubSubType::~MapUShortLongPubSubType() bool MapUShortLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5123,12 +5123,12 @@ bool MapUShortLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5137,14 +5137,14 @@ bool MapUShortLongPubSubType::deserialize( MapUShortLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5189,8 +5189,8 @@ void MapUShortLongPubSubType::delete_data( } bool MapUShortLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5209,7 +5209,7 @@ bool MapUShortLongPubSubType::compute_key( bool MapUShortLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5233,14 +5233,14 @@ bool MapUShortLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5273,18 +5273,18 @@ MapUShortULongPubSubType::~MapUShortULongPubSubType() bool MapUShortULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5303,12 +5303,12 @@ bool MapUShortULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5317,14 +5317,14 @@ bool MapUShortULongPubSubType::deserialize( MapUShortULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5369,8 +5369,8 @@ void MapUShortULongPubSubType::delete_data( } bool MapUShortULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5389,7 +5389,7 @@ bool MapUShortULongPubSubType::compute_key( bool MapUShortULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5413,14 +5413,14 @@ bool MapUShortULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5453,18 +5453,18 @@ MapUShortLongLongPubSubType::~MapUShortLongLongPubSubType() bool MapUShortLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5483,12 +5483,12 @@ bool MapUShortLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5497,14 +5497,14 @@ bool MapUShortLongLongPubSubType::deserialize( MapUShortLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5549,8 +5549,8 @@ void MapUShortLongLongPubSubType::delete_data( } bool MapUShortLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5569,7 +5569,7 @@ bool MapUShortLongLongPubSubType::compute_key( bool MapUShortLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5593,14 +5593,14 @@ bool MapUShortLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5633,18 +5633,18 @@ MapUShortULongLongPubSubType::~MapUShortULongLongPubSubType() bool MapUShortULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5663,12 +5663,12 @@ bool MapUShortULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5677,14 +5677,14 @@ bool MapUShortULongLongPubSubType::deserialize( MapUShortULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5729,8 +5729,8 @@ void MapUShortULongLongPubSubType::delete_data( } bool MapUShortULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5749,7 +5749,7 @@ bool MapUShortULongLongPubSubType::compute_key( bool MapUShortULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5773,14 +5773,14 @@ bool MapUShortULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5813,18 +5813,18 @@ MapUShortFloatPubSubType::~MapUShortFloatPubSubType() bool MapUShortFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5843,12 +5843,12 @@ bool MapUShortFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5857,14 +5857,14 @@ bool MapUShortFloatPubSubType::deserialize( MapUShortFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5909,8 +5909,8 @@ void MapUShortFloatPubSubType::delete_data( } bool MapUShortFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5929,7 +5929,7 @@ bool MapUShortFloatPubSubType::compute_key( bool MapUShortFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5953,14 +5953,14 @@ bool MapUShortFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5993,18 +5993,18 @@ MapUShortDoublePubSubType::~MapUShortDoublePubSubType() bool MapUShortDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6023,12 +6023,12 @@ bool MapUShortDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6037,14 +6037,14 @@ bool MapUShortDoublePubSubType::deserialize( MapUShortDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6089,8 +6089,8 @@ void MapUShortDoublePubSubType::delete_data( } bool MapUShortDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6109,7 +6109,7 @@ bool MapUShortDoublePubSubType::compute_key( bool MapUShortDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6133,14 +6133,14 @@ bool MapUShortDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6173,18 +6173,18 @@ MapUShortLongDoublePubSubType::~MapUShortLongDoublePubSubType() bool MapUShortLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6203,12 +6203,12 @@ bool MapUShortLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6217,14 +6217,14 @@ bool MapUShortLongDoublePubSubType::deserialize( MapUShortLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6269,8 +6269,8 @@ void MapUShortLongDoublePubSubType::delete_data( } bool MapUShortLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6289,7 +6289,7 @@ bool MapUShortLongDoublePubSubType::compute_key( bool MapUShortLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6313,14 +6313,14 @@ bool MapUShortLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6353,18 +6353,18 @@ MapUShortBooleanPubSubType::~MapUShortBooleanPubSubType() bool MapUShortBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6383,12 +6383,12 @@ bool MapUShortBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6397,14 +6397,14 @@ bool MapUShortBooleanPubSubType::deserialize( MapUShortBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6449,8 +6449,8 @@ void MapUShortBooleanPubSubType::delete_data( } bool MapUShortBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6469,7 +6469,7 @@ bool MapUShortBooleanPubSubType::compute_key( bool MapUShortBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6493,14 +6493,14 @@ bool MapUShortBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6533,18 +6533,18 @@ MapUShortOctetPubSubType::~MapUShortOctetPubSubType() bool MapUShortOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6563,12 +6563,12 @@ bool MapUShortOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6577,14 +6577,14 @@ bool MapUShortOctetPubSubType::deserialize( MapUShortOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6629,8 +6629,8 @@ void MapUShortOctetPubSubType::delete_data( } bool MapUShortOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6649,7 +6649,7 @@ bool MapUShortOctetPubSubType::compute_key( bool MapUShortOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6673,14 +6673,14 @@ bool MapUShortOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6713,18 +6713,18 @@ MapUShortCharPubSubType::~MapUShortCharPubSubType() bool MapUShortCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6743,12 +6743,12 @@ bool MapUShortCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6757,14 +6757,14 @@ bool MapUShortCharPubSubType::deserialize( MapUShortChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6809,8 +6809,8 @@ void MapUShortCharPubSubType::delete_data( } bool MapUShortCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6829,7 +6829,7 @@ bool MapUShortCharPubSubType::compute_key( bool MapUShortCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6853,14 +6853,14 @@ bool MapUShortCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6893,18 +6893,18 @@ MapUShortWCharPubSubType::~MapUShortWCharPubSubType() bool MapUShortWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6923,12 +6923,12 @@ bool MapUShortWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6937,14 +6937,14 @@ bool MapUShortWCharPubSubType::deserialize( MapUShortWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6989,8 +6989,8 @@ void MapUShortWCharPubSubType::delete_data( } bool MapUShortWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7009,7 +7009,7 @@ bool MapUShortWCharPubSubType::compute_key( bool MapUShortWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7033,14 +7033,14 @@ bool MapUShortWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7073,18 +7073,18 @@ MapUShortStringPubSubType::~MapUShortStringPubSubType() bool MapUShortStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7103,12 +7103,12 @@ bool MapUShortStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7117,14 +7117,14 @@ bool MapUShortStringPubSubType::deserialize( MapUShortString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7169,8 +7169,8 @@ void MapUShortStringPubSubType::delete_data( } bool MapUShortStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7189,7 +7189,7 @@ bool MapUShortStringPubSubType::compute_key( bool MapUShortStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7213,14 +7213,14 @@ bool MapUShortStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7253,18 +7253,18 @@ MapUShortWStringPubSubType::~MapUShortWStringPubSubType() bool MapUShortWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7283,12 +7283,12 @@ bool MapUShortWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7297,14 +7297,14 @@ bool MapUShortWStringPubSubType::deserialize( MapUShortWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7349,8 +7349,8 @@ void MapUShortWStringPubSubType::delete_data( } bool MapUShortWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7369,7 +7369,7 @@ bool MapUShortWStringPubSubType::compute_key( bool MapUShortWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7393,14 +7393,14 @@ bool MapUShortWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7433,18 +7433,18 @@ MapUShortInnerAliasBoundedStringHelperPubSubType::~MapUShortInnerAliasBoundedStr bool MapUShortInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7463,12 +7463,12 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7477,14 +7477,14 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::deserialize( MapUShortInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7529,8 +7529,8 @@ void MapUShortInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7549,7 +7549,7 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7573,14 +7573,14 @@ bool MapUShortInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7613,18 +7613,18 @@ MapUShortInnerAliasBoundedWStringHelperPubSubType::~MapUShortInnerAliasBoundedWS bool MapUShortInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7643,12 +7643,12 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7657,14 +7657,14 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::deserialize( MapUShortInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7709,8 +7709,8 @@ void MapUShortInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7729,7 +7729,7 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7753,14 +7753,14 @@ bool MapUShortInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7793,18 +7793,18 @@ MapUShortInnerEnumHelperPubSubType::~MapUShortInnerEnumHelperPubSubType() bool MapUShortInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7823,12 +7823,12 @@ bool MapUShortInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7837,14 +7837,14 @@ bool MapUShortInnerEnumHelperPubSubType::deserialize( MapUShortInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7889,8 +7889,8 @@ void MapUShortInnerEnumHelperPubSubType::delete_data( } bool MapUShortInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7909,7 +7909,7 @@ bool MapUShortInnerEnumHelperPubSubType::compute_key( bool MapUShortInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7933,14 +7933,14 @@ bool MapUShortInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7973,18 +7973,18 @@ MapUShortInnerBitMaskHelperPubSubType::~MapUShortInnerBitMaskHelperPubSubType() bool MapUShortInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8003,12 +8003,12 @@ bool MapUShortInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8017,14 +8017,14 @@ bool MapUShortInnerBitMaskHelperPubSubType::deserialize( MapUShortInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8069,8 +8069,8 @@ void MapUShortInnerBitMaskHelperPubSubType::delete_data( } bool MapUShortInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8089,7 +8089,7 @@ bool MapUShortInnerBitMaskHelperPubSubType::compute_key( bool MapUShortInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8113,14 +8113,14 @@ bool MapUShortInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8153,18 +8153,18 @@ MapUShortInnerAliasHelperPubSubType::~MapUShortInnerAliasHelperPubSubType() bool MapUShortInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8183,12 +8183,12 @@ bool MapUShortInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8197,14 +8197,14 @@ bool MapUShortInnerAliasHelperPubSubType::deserialize( MapUShortInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8249,8 +8249,8 @@ void MapUShortInnerAliasHelperPubSubType::delete_data( } bool MapUShortInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8269,7 +8269,7 @@ bool MapUShortInnerAliasHelperPubSubType::compute_key( bool MapUShortInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8293,14 +8293,14 @@ bool MapUShortInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8333,18 +8333,18 @@ MapUShortInnerAliasArrayHelperPubSubType::~MapUShortInnerAliasArrayHelperPubSubT bool MapUShortInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8363,12 +8363,12 @@ bool MapUShortInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8377,14 +8377,14 @@ bool MapUShortInnerAliasArrayHelperPubSubType::deserialize( MapUShortInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8429,8 +8429,8 @@ void MapUShortInnerAliasArrayHelperPubSubType::delete_data( } bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8449,7 +8449,7 @@ bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8473,14 +8473,14 @@ bool MapUShortInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8513,18 +8513,18 @@ MapUShortInnerAliasSequenceHelperPubSubType::~MapUShortInnerAliasSequenceHelperP bool MapUShortInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8543,12 +8543,12 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8557,14 +8557,14 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::deserialize( MapUShortInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8609,8 +8609,8 @@ void MapUShortInnerAliasSequenceHelperPubSubType::delete_data( } bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8629,7 +8629,7 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8653,14 +8653,14 @@ bool MapUShortInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8693,18 +8693,18 @@ MapUShortInnerAliasMapHelperPubSubType::~MapUShortInnerAliasMapHelperPubSubType( bool MapUShortInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8723,12 +8723,12 @@ bool MapUShortInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8737,14 +8737,14 @@ bool MapUShortInnerAliasMapHelperPubSubType::deserialize( MapUShortInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8789,8 +8789,8 @@ void MapUShortInnerAliasMapHelperPubSubType::delete_data( } bool MapUShortInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8809,7 +8809,7 @@ bool MapUShortInnerAliasMapHelperPubSubType::compute_key( bool MapUShortInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8833,14 +8833,14 @@ bool MapUShortInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8873,18 +8873,18 @@ MapUShortInnerUnionHelperPubSubType::~MapUShortInnerUnionHelperPubSubType() bool MapUShortInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8903,12 +8903,12 @@ bool MapUShortInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8917,14 +8917,14 @@ bool MapUShortInnerUnionHelperPubSubType::deserialize( MapUShortInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8969,8 +8969,8 @@ void MapUShortInnerUnionHelperPubSubType::delete_data( } bool MapUShortInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8989,7 +8989,7 @@ bool MapUShortInnerUnionHelperPubSubType::compute_key( bool MapUShortInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9013,14 +9013,14 @@ bool MapUShortInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9053,18 +9053,18 @@ MapUShortInnerStructureHelperPubSubType::~MapUShortInnerStructureHelperPubSubTyp bool MapUShortInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9083,12 +9083,12 @@ bool MapUShortInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9097,14 +9097,14 @@ bool MapUShortInnerStructureHelperPubSubType::deserialize( MapUShortInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9149,8 +9149,8 @@ void MapUShortInnerStructureHelperPubSubType::delete_data( } bool MapUShortInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9169,7 +9169,7 @@ bool MapUShortInnerStructureHelperPubSubType::compute_key( bool MapUShortInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9193,14 +9193,14 @@ bool MapUShortInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9233,18 +9233,18 @@ MapUShortInnerBitsetHelperPubSubType::~MapUShortInnerBitsetHelperPubSubType() bool MapUShortInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapUShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9263,12 +9263,12 @@ bool MapUShortInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapUShortInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9277,14 +9277,14 @@ bool MapUShortInnerBitsetHelperPubSubType::deserialize( MapUShortInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9329,8 +9329,8 @@ void MapUShortInnerBitsetHelperPubSubType::delete_data( } bool MapUShortInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9349,7 +9349,7 @@ bool MapUShortInnerBitsetHelperPubSubType::compute_key( bool MapUShortInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9373,14 +9373,14 @@ bool MapUShortInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9413,18 +9413,18 @@ MapLongShortPubSubType::~MapLongShortPubSubType() bool MapLongShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9443,12 +9443,12 @@ bool MapLongShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9457,14 +9457,14 @@ bool MapLongShortPubSubType::deserialize( MapLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9509,8 +9509,8 @@ void MapLongShortPubSubType::delete_data( } bool MapLongShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9529,7 +9529,7 @@ bool MapLongShortPubSubType::compute_key( bool MapLongShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9553,14 +9553,14 @@ bool MapLongShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9593,18 +9593,18 @@ MapLongUShortPubSubType::~MapLongUShortPubSubType() bool MapLongUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9623,12 +9623,12 @@ bool MapLongUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9637,14 +9637,14 @@ bool MapLongUShortPubSubType::deserialize( MapLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9689,8 +9689,8 @@ void MapLongUShortPubSubType::delete_data( } bool MapLongUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9709,7 +9709,7 @@ bool MapLongUShortPubSubType::compute_key( bool MapLongUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9733,14 +9733,14 @@ bool MapLongUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9773,18 +9773,18 @@ MapLongLongPubSubType::~MapLongLongPubSubType() bool MapLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9803,12 +9803,12 @@ bool MapLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9817,14 +9817,14 @@ bool MapLongLongPubSubType::deserialize( MapLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9869,8 +9869,8 @@ void MapLongLongPubSubType::delete_data( } bool MapLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9889,7 +9889,7 @@ bool MapLongLongPubSubType::compute_key( bool MapLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9913,14 +9913,14 @@ bool MapLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9953,18 +9953,18 @@ MapLongULongPubSubType::~MapLongULongPubSubType() bool MapLongULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9983,12 +9983,12 @@ bool MapLongULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9997,14 +9997,14 @@ bool MapLongULongPubSubType::deserialize( MapLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10049,8 +10049,8 @@ void MapLongULongPubSubType::delete_data( } bool MapLongULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10069,7 +10069,7 @@ bool MapLongULongPubSubType::compute_key( bool MapLongULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10093,14 +10093,14 @@ bool MapLongULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10133,18 +10133,18 @@ MapLongKeyLongLongValuePubSubType::~MapLongKeyLongLongValuePubSubType() bool MapLongKeyLongLongValuePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongKeyLongLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10163,12 +10163,12 @@ bool MapLongKeyLongLongValuePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongKeyLongLongValuePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10177,14 +10177,14 @@ bool MapLongKeyLongLongValuePubSubType::deserialize( MapLongKeyLongLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10229,8 +10229,8 @@ void MapLongKeyLongLongValuePubSubType::delete_data( } bool MapLongKeyLongLongValuePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10249,7 +10249,7 @@ bool MapLongKeyLongLongValuePubSubType::compute_key( bool MapLongKeyLongLongValuePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10273,14 +10273,14 @@ bool MapLongKeyLongLongValuePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10313,18 +10313,18 @@ MapLongULongLongPubSubType::~MapLongULongLongPubSubType() bool MapLongULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10343,12 +10343,12 @@ bool MapLongULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10357,14 +10357,14 @@ bool MapLongULongLongPubSubType::deserialize( MapLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10409,8 +10409,8 @@ void MapLongULongLongPubSubType::delete_data( } bool MapLongULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10429,7 +10429,7 @@ bool MapLongULongLongPubSubType::compute_key( bool MapLongULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10453,14 +10453,14 @@ bool MapLongULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10493,18 +10493,18 @@ MapLongFloatPubSubType::~MapLongFloatPubSubType() bool MapLongFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10523,12 +10523,12 @@ bool MapLongFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10537,14 +10537,14 @@ bool MapLongFloatPubSubType::deserialize( MapLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10589,8 +10589,8 @@ void MapLongFloatPubSubType::delete_data( } bool MapLongFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10609,7 +10609,7 @@ bool MapLongFloatPubSubType::compute_key( bool MapLongFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10633,14 +10633,14 @@ bool MapLongFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10673,18 +10673,18 @@ MapLongDoublePubSubType::~MapLongDoublePubSubType() bool MapLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10703,12 +10703,12 @@ bool MapLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10717,14 +10717,14 @@ bool MapLongDoublePubSubType::deserialize( MapLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10769,8 +10769,8 @@ void MapLongDoublePubSubType::delete_data( } bool MapLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10789,7 +10789,7 @@ bool MapLongDoublePubSubType::compute_key( bool MapLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10813,14 +10813,14 @@ bool MapLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10853,18 +10853,18 @@ MapLongKeyLongDoubleValuePubSubType::~MapLongKeyLongDoubleValuePubSubType() bool MapLongKeyLongDoubleValuePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongKeyLongDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10883,12 +10883,12 @@ bool MapLongKeyLongDoubleValuePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongKeyLongDoubleValuePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10897,14 +10897,14 @@ bool MapLongKeyLongDoubleValuePubSubType::deserialize( MapLongKeyLongDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10949,8 +10949,8 @@ void MapLongKeyLongDoubleValuePubSubType::delete_data( } bool MapLongKeyLongDoubleValuePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10969,7 +10969,7 @@ bool MapLongKeyLongDoubleValuePubSubType::compute_key( bool MapLongKeyLongDoubleValuePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10993,14 +10993,14 @@ bool MapLongKeyLongDoubleValuePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11033,18 +11033,18 @@ MapLongBooleanPubSubType::~MapLongBooleanPubSubType() bool MapLongBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11063,12 +11063,12 @@ bool MapLongBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11077,14 +11077,14 @@ bool MapLongBooleanPubSubType::deserialize( MapLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11129,8 +11129,8 @@ void MapLongBooleanPubSubType::delete_data( } bool MapLongBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11149,7 +11149,7 @@ bool MapLongBooleanPubSubType::compute_key( bool MapLongBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11173,14 +11173,14 @@ bool MapLongBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11213,18 +11213,18 @@ MapLongOctetPubSubType::~MapLongOctetPubSubType() bool MapLongOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11243,12 +11243,12 @@ bool MapLongOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11257,14 +11257,14 @@ bool MapLongOctetPubSubType::deserialize( MapLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11309,8 +11309,8 @@ void MapLongOctetPubSubType::delete_data( } bool MapLongOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11329,7 +11329,7 @@ bool MapLongOctetPubSubType::compute_key( bool MapLongOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11353,14 +11353,14 @@ bool MapLongOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11393,18 +11393,18 @@ MapLongCharPubSubType::~MapLongCharPubSubType() bool MapLongCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11423,12 +11423,12 @@ bool MapLongCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11437,14 +11437,14 @@ bool MapLongCharPubSubType::deserialize( MapLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11489,8 +11489,8 @@ void MapLongCharPubSubType::delete_data( } bool MapLongCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11509,7 +11509,7 @@ bool MapLongCharPubSubType::compute_key( bool MapLongCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11533,14 +11533,14 @@ bool MapLongCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11573,18 +11573,18 @@ MapLongWCharPubSubType::~MapLongWCharPubSubType() bool MapLongWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11603,12 +11603,12 @@ bool MapLongWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11617,14 +11617,14 @@ bool MapLongWCharPubSubType::deserialize( MapLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11669,8 +11669,8 @@ void MapLongWCharPubSubType::delete_data( } bool MapLongWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11689,7 +11689,7 @@ bool MapLongWCharPubSubType::compute_key( bool MapLongWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11713,14 +11713,14 @@ bool MapLongWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11753,18 +11753,18 @@ MapLongStringPubSubType::~MapLongStringPubSubType() bool MapLongStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11783,12 +11783,12 @@ bool MapLongStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11797,14 +11797,14 @@ bool MapLongStringPubSubType::deserialize( MapLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11849,8 +11849,8 @@ void MapLongStringPubSubType::delete_data( } bool MapLongStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11869,7 +11869,7 @@ bool MapLongStringPubSubType::compute_key( bool MapLongStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11893,14 +11893,14 @@ bool MapLongStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11933,18 +11933,18 @@ MapLongWStringPubSubType::~MapLongWStringPubSubType() bool MapLongWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11963,12 +11963,12 @@ bool MapLongWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11977,14 +11977,14 @@ bool MapLongWStringPubSubType::deserialize( MapLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12029,8 +12029,8 @@ void MapLongWStringPubSubType::delete_data( } bool MapLongWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12049,7 +12049,7 @@ bool MapLongWStringPubSubType::compute_key( bool MapLongWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12073,14 +12073,14 @@ bool MapLongWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12113,18 +12113,18 @@ MapLongInnerAliasBoundedStringHelperPubSubType::~MapLongInnerAliasBoundedStringH bool MapLongInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12143,12 +12143,12 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12157,14 +12157,14 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::deserialize( MapLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12209,8 +12209,8 @@ void MapLongInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12229,7 +12229,7 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12253,14 +12253,14 @@ bool MapLongInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12293,18 +12293,18 @@ MapLongInnerAliasBoundedWStringHelperPubSubType::~MapLongInnerAliasBoundedWStrin bool MapLongInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12323,12 +12323,12 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12337,14 +12337,14 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::deserialize( MapLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12389,8 +12389,8 @@ void MapLongInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12409,7 +12409,7 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12433,14 +12433,14 @@ bool MapLongInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12473,18 +12473,18 @@ MapLongInnerEnumHelperPubSubType::~MapLongInnerEnumHelperPubSubType() bool MapLongInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12503,12 +12503,12 @@ bool MapLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12517,14 +12517,14 @@ bool MapLongInnerEnumHelperPubSubType::deserialize( MapLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12569,8 +12569,8 @@ void MapLongInnerEnumHelperPubSubType::delete_data( } bool MapLongInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12589,7 +12589,7 @@ bool MapLongInnerEnumHelperPubSubType::compute_key( bool MapLongInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12613,14 +12613,14 @@ bool MapLongInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12653,18 +12653,18 @@ MapLongInnerBitMaskHelperPubSubType::~MapLongInnerBitMaskHelperPubSubType() bool MapLongInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12683,12 +12683,12 @@ bool MapLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12697,14 +12697,14 @@ bool MapLongInnerBitMaskHelperPubSubType::deserialize( MapLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12749,8 +12749,8 @@ void MapLongInnerBitMaskHelperPubSubType::delete_data( } bool MapLongInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12769,7 +12769,7 @@ bool MapLongInnerBitMaskHelperPubSubType::compute_key( bool MapLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12793,14 +12793,14 @@ bool MapLongInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12833,18 +12833,18 @@ MapLongInnerAliasHelperPubSubType::~MapLongInnerAliasHelperPubSubType() bool MapLongInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12863,12 +12863,12 @@ bool MapLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12877,14 +12877,14 @@ bool MapLongInnerAliasHelperPubSubType::deserialize( MapLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12929,8 +12929,8 @@ void MapLongInnerAliasHelperPubSubType::delete_data( } bool MapLongInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12949,7 +12949,7 @@ bool MapLongInnerAliasHelperPubSubType::compute_key( bool MapLongInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12973,14 +12973,14 @@ bool MapLongInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13013,18 +13013,18 @@ MapLongInnerAliasArrayHelperPubSubType::~MapLongInnerAliasArrayHelperPubSubType( bool MapLongInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13043,12 +13043,12 @@ bool MapLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13057,14 +13057,14 @@ bool MapLongInnerAliasArrayHelperPubSubType::deserialize( MapLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13109,8 +13109,8 @@ void MapLongInnerAliasArrayHelperPubSubType::delete_data( } bool MapLongInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13129,7 +13129,7 @@ bool MapLongInnerAliasArrayHelperPubSubType::compute_key( bool MapLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13153,14 +13153,14 @@ bool MapLongInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13193,18 +13193,18 @@ MapLongInnerAliasSequenceHelperPubSubType::~MapLongInnerAliasSequenceHelperPubSu bool MapLongInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13223,12 +13223,12 @@ bool MapLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13237,14 +13237,14 @@ bool MapLongInnerAliasSequenceHelperPubSubType::deserialize( MapLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13289,8 +13289,8 @@ void MapLongInnerAliasSequenceHelperPubSubType::delete_data( } bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13309,7 +13309,7 @@ bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13333,14 +13333,14 @@ bool MapLongInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13373,18 +13373,18 @@ MapLongInnerAliasMapHelperPubSubType::~MapLongInnerAliasMapHelperPubSubType() bool MapLongInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13403,12 +13403,12 @@ bool MapLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13417,14 +13417,14 @@ bool MapLongInnerAliasMapHelperPubSubType::deserialize( MapLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13469,8 +13469,8 @@ void MapLongInnerAliasMapHelperPubSubType::delete_data( } bool MapLongInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13489,7 +13489,7 @@ bool MapLongInnerAliasMapHelperPubSubType::compute_key( bool MapLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13513,14 +13513,14 @@ bool MapLongInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13553,18 +13553,18 @@ MapLongInnerUnionHelperPubSubType::~MapLongInnerUnionHelperPubSubType() bool MapLongInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13583,12 +13583,12 @@ bool MapLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13597,14 +13597,14 @@ bool MapLongInnerUnionHelperPubSubType::deserialize( MapLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13649,8 +13649,8 @@ void MapLongInnerUnionHelperPubSubType::delete_data( } bool MapLongInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13669,7 +13669,7 @@ bool MapLongInnerUnionHelperPubSubType::compute_key( bool MapLongInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13693,14 +13693,14 @@ bool MapLongInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13733,18 +13733,18 @@ MapLongInnerStructureHelperPubSubType::~MapLongInnerStructureHelperPubSubType() bool MapLongInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13763,12 +13763,12 @@ bool MapLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13777,14 +13777,14 @@ bool MapLongInnerStructureHelperPubSubType::deserialize( MapLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13829,8 +13829,8 @@ void MapLongInnerStructureHelperPubSubType::delete_data( } bool MapLongInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13849,7 +13849,7 @@ bool MapLongInnerStructureHelperPubSubType::compute_key( bool MapLongInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13873,14 +13873,14 @@ bool MapLongInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13913,18 +13913,18 @@ MapLongInnerBitsetHelperPubSubType::~MapLongInnerBitsetHelperPubSubType() bool MapLongInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13943,12 +13943,12 @@ bool MapLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13957,14 +13957,14 @@ bool MapLongInnerBitsetHelperPubSubType::deserialize( MapLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14009,8 +14009,8 @@ void MapLongInnerBitsetHelperPubSubType::delete_data( } bool MapLongInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14029,7 +14029,7 @@ bool MapLongInnerBitsetHelperPubSubType::compute_key( bool MapLongInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14053,14 +14053,14 @@ bool MapLongInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14093,18 +14093,18 @@ MapULongShortPubSubType::~MapULongShortPubSubType() bool MapULongShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14123,12 +14123,12 @@ bool MapULongShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14137,14 +14137,14 @@ bool MapULongShortPubSubType::deserialize( MapULongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14189,8 +14189,8 @@ void MapULongShortPubSubType::delete_data( } bool MapULongShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14209,7 +14209,7 @@ bool MapULongShortPubSubType::compute_key( bool MapULongShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14233,14 +14233,14 @@ bool MapULongShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14273,18 +14273,18 @@ MapULongUShortPubSubType::~MapULongUShortPubSubType() bool MapULongUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14303,12 +14303,12 @@ bool MapULongUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14317,14 +14317,14 @@ bool MapULongUShortPubSubType::deserialize( MapULongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14369,8 +14369,8 @@ void MapULongUShortPubSubType::delete_data( } bool MapULongUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14389,7 +14389,7 @@ bool MapULongUShortPubSubType::compute_key( bool MapULongUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14413,14 +14413,14 @@ bool MapULongUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14453,18 +14453,18 @@ MapULongLongPubSubType::~MapULongLongPubSubType() bool MapULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14483,12 +14483,12 @@ bool MapULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14497,14 +14497,14 @@ bool MapULongLongPubSubType::deserialize( MapULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14549,8 +14549,8 @@ void MapULongLongPubSubType::delete_data( } bool MapULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14569,7 +14569,7 @@ bool MapULongLongPubSubType::compute_key( bool MapULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14593,14 +14593,14 @@ bool MapULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14633,18 +14633,18 @@ MapULongULongPubSubType::~MapULongULongPubSubType() bool MapULongULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14663,12 +14663,12 @@ bool MapULongULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14677,14 +14677,14 @@ bool MapULongULongPubSubType::deserialize( MapULongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14729,8 +14729,8 @@ void MapULongULongPubSubType::delete_data( } bool MapULongULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14749,7 +14749,7 @@ bool MapULongULongPubSubType::compute_key( bool MapULongULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14773,14 +14773,14 @@ bool MapULongULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14813,18 +14813,18 @@ MapKeyULongValueLongLongPubSubType::~MapKeyULongValueLongLongPubSubType() bool MapKeyULongValueLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapKeyULongValueLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14843,12 +14843,12 @@ bool MapKeyULongValueLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapKeyULongValueLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14857,14 +14857,14 @@ bool MapKeyULongValueLongLongPubSubType::deserialize( MapKeyULongValueLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14909,8 +14909,8 @@ void MapKeyULongValueLongLongPubSubType::delete_data( } bool MapKeyULongValueLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14929,7 +14929,7 @@ bool MapKeyULongValueLongLongPubSubType::compute_key( bool MapKeyULongValueLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14953,14 +14953,14 @@ bool MapKeyULongValueLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14993,18 +14993,18 @@ MapULongULongLongPubSubType::~MapULongULongLongPubSubType() bool MapULongULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15023,12 +15023,12 @@ bool MapULongULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15037,14 +15037,14 @@ bool MapULongULongLongPubSubType::deserialize( MapULongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15089,8 +15089,8 @@ void MapULongULongLongPubSubType::delete_data( } bool MapULongULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15109,7 +15109,7 @@ bool MapULongULongLongPubSubType::compute_key( bool MapULongULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15133,14 +15133,14 @@ bool MapULongULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15173,18 +15173,18 @@ MapULongFloatPubSubType::~MapULongFloatPubSubType() bool MapULongFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15203,12 +15203,12 @@ bool MapULongFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15217,14 +15217,14 @@ bool MapULongFloatPubSubType::deserialize( MapULongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15269,8 +15269,8 @@ void MapULongFloatPubSubType::delete_data( } bool MapULongFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15289,7 +15289,7 @@ bool MapULongFloatPubSubType::compute_key( bool MapULongFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15313,14 +15313,14 @@ bool MapULongFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15353,18 +15353,18 @@ MapULongDoublePubSubType::~MapULongDoublePubSubType() bool MapULongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15383,12 +15383,12 @@ bool MapULongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15397,14 +15397,14 @@ bool MapULongDoublePubSubType::deserialize( MapULongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15449,8 +15449,8 @@ void MapULongDoublePubSubType::delete_data( } bool MapULongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15469,7 +15469,7 @@ bool MapULongDoublePubSubType::compute_key( bool MapULongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15493,14 +15493,14 @@ bool MapULongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15533,18 +15533,18 @@ MapKeyULongValueLongDoublePubSubType::~MapKeyULongValueLongDoublePubSubType() bool MapKeyULongValueLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapKeyULongValueLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15563,12 +15563,12 @@ bool MapKeyULongValueLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapKeyULongValueLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15577,14 +15577,14 @@ bool MapKeyULongValueLongDoublePubSubType::deserialize( MapKeyULongValueLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15629,8 +15629,8 @@ void MapKeyULongValueLongDoublePubSubType::delete_data( } bool MapKeyULongValueLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15649,7 +15649,7 @@ bool MapKeyULongValueLongDoublePubSubType::compute_key( bool MapKeyULongValueLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15673,14 +15673,14 @@ bool MapKeyULongValueLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15713,18 +15713,18 @@ MapULongBooleanPubSubType::~MapULongBooleanPubSubType() bool MapULongBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15743,12 +15743,12 @@ bool MapULongBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15757,14 +15757,14 @@ bool MapULongBooleanPubSubType::deserialize( MapULongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15809,8 +15809,8 @@ void MapULongBooleanPubSubType::delete_data( } bool MapULongBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15829,7 +15829,7 @@ bool MapULongBooleanPubSubType::compute_key( bool MapULongBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -15853,14 +15853,14 @@ bool MapULongBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -15893,18 +15893,18 @@ MapULongOctetPubSubType::~MapULongOctetPubSubType() bool MapULongOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -15923,12 +15923,12 @@ bool MapULongOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -15937,14 +15937,14 @@ bool MapULongOctetPubSubType::deserialize( MapULongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -15989,8 +15989,8 @@ void MapULongOctetPubSubType::delete_data( } bool MapULongOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16009,7 +16009,7 @@ bool MapULongOctetPubSubType::compute_key( bool MapULongOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16033,14 +16033,14 @@ bool MapULongOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16073,18 +16073,18 @@ MapULongCharPubSubType::~MapULongCharPubSubType() bool MapULongCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16103,12 +16103,12 @@ bool MapULongCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16117,14 +16117,14 @@ bool MapULongCharPubSubType::deserialize( MapULongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16169,8 +16169,8 @@ void MapULongCharPubSubType::delete_data( } bool MapULongCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16189,7 +16189,7 @@ bool MapULongCharPubSubType::compute_key( bool MapULongCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16213,14 +16213,14 @@ bool MapULongCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16253,18 +16253,18 @@ MapULongWCharPubSubType::~MapULongWCharPubSubType() bool MapULongWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16283,12 +16283,12 @@ bool MapULongWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16297,14 +16297,14 @@ bool MapULongWCharPubSubType::deserialize( MapULongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16349,8 +16349,8 @@ void MapULongWCharPubSubType::delete_data( } bool MapULongWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16369,7 +16369,7 @@ bool MapULongWCharPubSubType::compute_key( bool MapULongWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16393,14 +16393,14 @@ bool MapULongWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16433,18 +16433,18 @@ MapULongStringPubSubType::~MapULongStringPubSubType() bool MapULongStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16463,12 +16463,12 @@ bool MapULongStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16477,14 +16477,14 @@ bool MapULongStringPubSubType::deserialize( MapULongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16529,8 +16529,8 @@ void MapULongStringPubSubType::delete_data( } bool MapULongStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16549,7 +16549,7 @@ bool MapULongStringPubSubType::compute_key( bool MapULongStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16573,14 +16573,14 @@ bool MapULongStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16613,18 +16613,18 @@ MapULongWStringPubSubType::~MapULongWStringPubSubType() bool MapULongWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16643,12 +16643,12 @@ bool MapULongWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16657,14 +16657,14 @@ bool MapULongWStringPubSubType::deserialize( MapULongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16709,8 +16709,8 @@ void MapULongWStringPubSubType::delete_data( } bool MapULongWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16729,7 +16729,7 @@ bool MapULongWStringPubSubType::compute_key( bool MapULongWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16753,14 +16753,14 @@ bool MapULongWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16793,18 +16793,18 @@ MapULongInnerAliasBoundedStringHelperPubSubType::~MapULongInnerAliasBoundedStrin bool MapULongInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -16823,12 +16823,12 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -16837,14 +16837,14 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::deserialize( MapULongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -16889,8 +16889,8 @@ void MapULongInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16909,7 +16909,7 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -16933,14 +16933,14 @@ bool MapULongInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -16973,18 +16973,18 @@ MapULongInnerAliasBoundedWStringHelperPubSubType::~MapULongInnerAliasBoundedWStr bool MapULongInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17003,12 +17003,12 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17017,14 +17017,14 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::deserialize( MapULongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17069,8 +17069,8 @@ void MapULongInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17089,7 +17089,7 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17113,14 +17113,14 @@ bool MapULongInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17153,18 +17153,18 @@ MapULongInnerEnumHelperPubSubType::~MapULongInnerEnumHelperPubSubType() bool MapULongInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17183,12 +17183,12 @@ bool MapULongInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17197,14 +17197,14 @@ bool MapULongInnerEnumHelperPubSubType::deserialize( MapULongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17249,8 +17249,8 @@ void MapULongInnerEnumHelperPubSubType::delete_data( } bool MapULongInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17269,7 +17269,7 @@ bool MapULongInnerEnumHelperPubSubType::compute_key( bool MapULongInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17293,14 +17293,14 @@ bool MapULongInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17333,18 +17333,18 @@ MapULongInnerBitMaskHelperPubSubType::~MapULongInnerBitMaskHelperPubSubType() bool MapULongInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17363,12 +17363,12 @@ bool MapULongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17377,14 +17377,14 @@ bool MapULongInnerBitMaskHelperPubSubType::deserialize( MapULongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17429,8 +17429,8 @@ void MapULongInnerBitMaskHelperPubSubType::delete_data( } bool MapULongInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17449,7 +17449,7 @@ bool MapULongInnerBitMaskHelperPubSubType::compute_key( bool MapULongInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17473,14 +17473,14 @@ bool MapULongInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17513,18 +17513,18 @@ MapULongInnerAliasHelperPubSubType::~MapULongInnerAliasHelperPubSubType() bool MapULongInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17543,12 +17543,12 @@ bool MapULongInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17557,14 +17557,14 @@ bool MapULongInnerAliasHelperPubSubType::deserialize( MapULongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17609,8 +17609,8 @@ void MapULongInnerAliasHelperPubSubType::delete_data( } bool MapULongInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17629,7 +17629,7 @@ bool MapULongInnerAliasHelperPubSubType::compute_key( bool MapULongInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17653,14 +17653,14 @@ bool MapULongInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17693,18 +17693,18 @@ MapULongInnerAliasArrayHelperPubSubType::~MapULongInnerAliasArrayHelperPubSubTyp bool MapULongInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17723,12 +17723,12 @@ bool MapULongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17737,14 +17737,14 @@ bool MapULongInnerAliasArrayHelperPubSubType::deserialize( MapULongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17789,8 +17789,8 @@ void MapULongInnerAliasArrayHelperPubSubType::delete_data( } bool MapULongInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17809,7 +17809,7 @@ bool MapULongInnerAliasArrayHelperPubSubType::compute_key( bool MapULongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17833,14 +17833,14 @@ bool MapULongInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -17873,18 +17873,18 @@ MapULongInnerAliasSequenceHelperPubSubType::~MapULongInnerAliasSequenceHelperPub bool MapULongInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -17903,12 +17903,12 @@ bool MapULongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -17917,14 +17917,14 @@ bool MapULongInnerAliasSequenceHelperPubSubType::deserialize( MapULongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -17969,8 +17969,8 @@ void MapULongInnerAliasSequenceHelperPubSubType::delete_data( } bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -17989,7 +17989,7 @@ bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18013,14 +18013,14 @@ bool MapULongInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18053,18 +18053,18 @@ MapULongInnerAliasMapHelperPubSubType::~MapULongInnerAliasMapHelperPubSubType() bool MapULongInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18083,12 +18083,12 @@ bool MapULongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18097,14 +18097,14 @@ bool MapULongInnerAliasMapHelperPubSubType::deserialize( MapULongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18149,8 +18149,8 @@ void MapULongInnerAliasMapHelperPubSubType::delete_data( } bool MapULongInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18169,7 +18169,7 @@ bool MapULongInnerAliasMapHelperPubSubType::compute_key( bool MapULongInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18193,14 +18193,14 @@ bool MapULongInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18233,18 +18233,18 @@ MapULongInnerUnionHelperPubSubType::~MapULongInnerUnionHelperPubSubType() bool MapULongInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18263,12 +18263,12 @@ bool MapULongInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18277,14 +18277,14 @@ bool MapULongInnerUnionHelperPubSubType::deserialize( MapULongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18329,8 +18329,8 @@ void MapULongInnerUnionHelperPubSubType::delete_data( } bool MapULongInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18349,7 +18349,7 @@ bool MapULongInnerUnionHelperPubSubType::compute_key( bool MapULongInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18373,14 +18373,14 @@ bool MapULongInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18413,18 +18413,18 @@ MapULongInnerStructureHelperPubSubType::~MapULongInnerStructureHelperPubSubType( bool MapULongInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18443,12 +18443,12 @@ bool MapULongInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18457,14 +18457,14 @@ bool MapULongInnerStructureHelperPubSubType::deserialize( MapULongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18509,8 +18509,8 @@ void MapULongInnerStructureHelperPubSubType::delete_data( } bool MapULongInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18529,7 +18529,7 @@ bool MapULongInnerStructureHelperPubSubType::compute_key( bool MapULongInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18553,14 +18553,14 @@ bool MapULongInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18593,18 +18593,18 @@ MapULongInnerBitsetHelperPubSubType::~MapULongInnerBitsetHelperPubSubType() bool MapULongInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18623,12 +18623,12 @@ bool MapULongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18637,14 +18637,14 @@ bool MapULongInnerBitsetHelperPubSubType::deserialize( MapULongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18689,8 +18689,8 @@ void MapULongInnerBitsetHelperPubSubType::delete_data( } bool MapULongInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18709,7 +18709,7 @@ bool MapULongInnerBitsetHelperPubSubType::compute_key( bool MapULongInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18733,14 +18733,14 @@ bool MapULongInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18773,18 +18773,18 @@ MapLongLongShortPubSubType::~MapLongLongShortPubSubType() bool MapLongLongShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18803,12 +18803,12 @@ bool MapLongLongShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18817,14 +18817,14 @@ bool MapLongLongShortPubSubType::deserialize( MapLongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -18869,8 +18869,8 @@ void MapLongLongShortPubSubType::delete_data( } bool MapLongLongShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18889,7 +18889,7 @@ bool MapLongLongShortPubSubType::compute_key( bool MapLongLongShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -18913,14 +18913,14 @@ bool MapLongLongShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -18953,18 +18953,18 @@ MapLongLongUShortPubSubType::~MapLongLongUShortPubSubType() bool MapLongLongUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -18983,12 +18983,12 @@ bool MapLongLongUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -18997,14 +18997,14 @@ bool MapLongLongUShortPubSubType::deserialize( MapLongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19049,8 +19049,8 @@ void MapLongLongUShortPubSubType::delete_data( } bool MapLongLongUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19069,7 +19069,7 @@ bool MapLongLongUShortPubSubType::compute_key( bool MapLongLongUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19093,14 +19093,14 @@ bool MapLongLongUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -19133,18 +19133,18 @@ MapLongLongKeyLongValuePubSubType::~MapLongLongKeyLongValuePubSubType() bool MapLongLongKeyLongValuePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongKeyLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -19163,12 +19163,12 @@ bool MapLongLongKeyLongValuePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongKeyLongValuePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -19177,14 +19177,14 @@ bool MapLongLongKeyLongValuePubSubType::deserialize( MapLongLongKeyLongValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19229,8 +19229,8 @@ void MapLongLongKeyLongValuePubSubType::delete_data( } bool MapLongLongKeyLongValuePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19249,7 +19249,7 @@ bool MapLongLongKeyLongValuePubSubType::compute_key( bool MapLongLongKeyLongValuePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19273,14 +19273,14 @@ bool MapLongLongKeyLongValuePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -19313,18 +19313,18 @@ MapLongLongULongPubSubType::~MapLongLongULongPubSubType() bool MapLongLongULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -19343,12 +19343,12 @@ bool MapLongLongULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -19357,14 +19357,14 @@ bool MapLongLongULongPubSubType::deserialize( MapLongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19409,8 +19409,8 @@ void MapLongLongULongPubSubType::delete_data( } bool MapLongLongULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19429,7 +19429,7 @@ bool MapLongLongULongPubSubType::compute_key( bool MapLongLongULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19453,14 +19453,14 @@ bool MapLongLongULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -19493,18 +19493,18 @@ MapLongLongLongLongPubSubType::~MapLongLongLongLongPubSubType() bool MapLongLongLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -19523,12 +19523,12 @@ bool MapLongLongLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -19537,14 +19537,14 @@ bool MapLongLongLongLongPubSubType::deserialize( MapLongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19589,8 +19589,8 @@ void MapLongLongLongLongPubSubType::delete_data( } bool MapLongLongLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19609,7 +19609,7 @@ bool MapLongLongLongLongPubSubType::compute_key( bool MapLongLongLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19633,14 +19633,14 @@ bool MapLongLongLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -19673,18 +19673,18 @@ MapLongLongULongLongPubSubType::~MapLongLongULongLongPubSubType() bool MapLongLongULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -19703,12 +19703,12 @@ bool MapLongLongULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -19717,14 +19717,14 @@ bool MapLongLongULongLongPubSubType::deserialize( MapLongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19769,8 +19769,8 @@ void MapLongLongULongLongPubSubType::delete_data( } bool MapLongLongULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19789,7 +19789,7 @@ bool MapLongLongULongLongPubSubType::compute_key( bool MapLongLongULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19813,14 +19813,14 @@ bool MapLongLongULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -19853,18 +19853,18 @@ MapLongLongFloatPubSubType::~MapLongLongFloatPubSubType() bool MapLongLongFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -19883,12 +19883,12 @@ bool MapLongLongFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -19897,14 +19897,14 @@ bool MapLongLongFloatPubSubType::deserialize( MapLongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -19949,8 +19949,8 @@ void MapLongLongFloatPubSubType::delete_data( } bool MapLongLongFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19969,7 +19969,7 @@ bool MapLongLongFloatPubSubType::compute_key( bool MapLongLongFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -19993,14 +19993,14 @@ bool MapLongLongFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20033,18 +20033,18 @@ MapLongLongKeyDoubleValuePubSubType::~MapLongLongKeyDoubleValuePubSubType() bool MapLongLongKeyDoubleValuePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongKeyDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20063,12 +20063,12 @@ bool MapLongLongKeyDoubleValuePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongKeyDoubleValuePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20077,14 +20077,14 @@ bool MapLongLongKeyDoubleValuePubSubType::deserialize( MapLongLongKeyDoubleValue* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -20129,8 +20129,8 @@ void MapLongLongKeyDoubleValuePubSubType::delete_data( } bool MapLongLongKeyDoubleValuePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20149,7 +20149,7 @@ bool MapLongLongKeyDoubleValuePubSubType::compute_key( bool MapLongLongKeyDoubleValuePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20173,14 +20173,14 @@ bool MapLongLongKeyDoubleValuePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20213,18 +20213,18 @@ MapLongLongLongDoublePubSubType::~MapLongLongLongDoublePubSubType() bool MapLongLongLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20243,12 +20243,12 @@ bool MapLongLongLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20257,14 +20257,14 @@ bool MapLongLongLongDoublePubSubType::deserialize( MapLongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -20309,8 +20309,8 @@ void MapLongLongLongDoublePubSubType::delete_data( } bool MapLongLongLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20329,7 +20329,7 @@ bool MapLongLongLongDoublePubSubType::compute_key( bool MapLongLongLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20353,14 +20353,14 @@ bool MapLongLongLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20393,18 +20393,18 @@ MapLongLongBooleanPubSubType::~MapLongLongBooleanPubSubType() bool MapLongLongBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20423,12 +20423,12 @@ bool MapLongLongBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20437,14 +20437,14 @@ bool MapLongLongBooleanPubSubType::deserialize( MapLongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -20489,8 +20489,8 @@ void MapLongLongBooleanPubSubType::delete_data( } bool MapLongLongBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20509,7 +20509,7 @@ bool MapLongLongBooleanPubSubType::compute_key( bool MapLongLongBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20533,14 +20533,14 @@ bool MapLongLongBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20573,18 +20573,18 @@ MapLongLongOctetPubSubType::~MapLongLongOctetPubSubType() bool MapLongLongOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20603,12 +20603,12 @@ bool MapLongLongOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20617,14 +20617,14 @@ bool MapLongLongOctetPubSubType::deserialize( MapLongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -20669,8 +20669,8 @@ void MapLongLongOctetPubSubType::delete_data( } bool MapLongLongOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20689,7 +20689,7 @@ bool MapLongLongOctetPubSubType::compute_key( bool MapLongLongOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20713,14 +20713,14 @@ bool MapLongLongOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20753,18 +20753,18 @@ MapLongLongCharPubSubType::~MapLongLongCharPubSubType() bool MapLongLongCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20783,12 +20783,12 @@ bool MapLongLongCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20797,14 +20797,14 @@ bool MapLongLongCharPubSubType::deserialize( MapLongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -20849,8 +20849,8 @@ void MapLongLongCharPubSubType::delete_data( } bool MapLongLongCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20869,7 +20869,7 @@ bool MapLongLongCharPubSubType::compute_key( bool MapLongLongCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -20893,14 +20893,14 @@ bool MapLongLongCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -20933,18 +20933,18 @@ MapLongLongWCharPubSubType::~MapLongLongWCharPubSubType() bool MapLongLongWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -20963,12 +20963,12 @@ bool MapLongLongWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -20977,14 +20977,14 @@ bool MapLongLongWCharPubSubType::deserialize( MapLongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21029,8 +21029,8 @@ void MapLongLongWCharPubSubType::delete_data( } bool MapLongLongWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21049,7 +21049,7 @@ bool MapLongLongWCharPubSubType::compute_key( bool MapLongLongWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21073,14 +21073,14 @@ bool MapLongLongWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -21113,18 +21113,18 @@ MapLongLongStringPubSubType::~MapLongLongStringPubSubType() bool MapLongLongStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -21143,12 +21143,12 @@ bool MapLongLongStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -21157,14 +21157,14 @@ bool MapLongLongStringPubSubType::deserialize( MapLongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21209,8 +21209,8 @@ void MapLongLongStringPubSubType::delete_data( } bool MapLongLongStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21229,7 +21229,7 @@ bool MapLongLongStringPubSubType::compute_key( bool MapLongLongStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21253,14 +21253,14 @@ bool MapLongLongStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -21293,18 +21293,18 @@ MapLongLongWStringPubSubType::~MapLongLongWStringPubSubType() bool MapLongLongWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -21323,12 +21323,12 @@ bool MapLongLongWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -21337,14 +21337,14 @@ bool MapLongLongWStringPubSubType::deserialize( MapLongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21389,8 +21389,8 @@ void MapLongLongWStringPubSubType::delete_data( } bool MapLongLongWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21409,7 +21409,7 @@ bool MapLongLongWStringPubSubType::compute_key( bool MapLongLongWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21433,14 +21433,14 @@ bool MapLongLongWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -21473,18 +21473,18 @@ MapLongLongInnerAliasBoundedStringHelperPubSubType::~MapLongLongInnerAliasBounde bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -21503,12 +21503,12 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -21517,14 +21517,14 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::deserialize( MapLongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21569,8 +21569,8 @@ void MapLongLongInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21589,7 +21589,7 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21613,14 +21613,14 @@ bool MapLongLongInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -21653,18 +21653,18 @@ MapLongLongInnerAliasBoundedWStringHelperPubSubType::~MapLongLongInnerAliasBound bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -21683,12 +21683,12 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -21697,14 +21697,14 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( MapLongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21749,8 +21749,8 @@ void MapLongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21769,7 +21769,7 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21793,14 +21793,14 @@ bool MapLongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -21833,18 +21833,18 @@ MapLongLongInnerEnumHelperPubSubType::~MapLongLongInnerEnumHelperPubSubType() bool MapLongLongInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -21863,12 +21863,12 @@ bool MapLongLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -21877,14 +21877,14 @@ bool MapLongLongInnerEnumHelperPubSubType::deserialize( MapLongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -21929,8 +21929,8 @@ void MapLongLongInnerEnumHelperPubSubType::delete_data( } bool MapLongLongInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21949,7 +21949,7 @@ bool MapLongLongInnerEnumHelperPubSubType::compute_key( bool MapLongLongInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -21973,14 +21973,14 @@ bool MapLongLongInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22013,18 +22013,18 @@ MapLongLongInnerBitMaskHelperPubSubType::~MapLongLongInnerBitMaskHelperPubSubTyp bool MapLongLongInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22043,12 +22043,12 @@ bool MapLongLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22057,14 +22057,14 @@ bool MapLongLongInnerBitMaskHelperPubSubType::deserialize( MapLongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -22109,8 +22109,8 @@ void MapLongLongInnerBitMaskHelperPubSubType::delete_data( } bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22129,7 +22129,7 @@ bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22153,14 +22153,14 @@ bool MapLongLongInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22193,18 +22193,18 @@ MapLongLongInnerAliasHelperPubSubType::~MapLongLongInnerAliasHelperPubSubType() bool MapLongLongInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22223,12 +22223,12 @@ bool MapLongLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22237,14 +22237,14 @@ bool MapLongLongInnerAliasHelperPubSubType::deserialize( MapLongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -22289,8 +22289,8 @@ void MapLongLongInnerAliasHelperPubSubType::delete_data( } bool MapLongLongInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22309,7 +22309,7 @@ bool MapLongLongInnerAliasHelperPubSubType::compute_key( bool MapLongLongInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22333,14 +22333,14 @@ bool MapLongLongInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22373,18 +22373,18 @@ MapLongLongInnerAliasArrayHelperPubSubType::~MapLongLongInnerAliasArrayHelperPub bool MapLongLongInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22403,12 +22403,12 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22417,14 +22417,14 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::deserialize( MapLongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -22469,8 +22469,8 @@ void MapLongLongInnerAliasArrayHelperPubSubType::delete_data( } bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22489,7 +22489,7 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22513,14 +22513,14 @@ bool MapLongLongInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22553,18 +22553,18 @@ MapLongLongInnerAliasSequenceHelperPubSubType::~MapLongLongInnerAliasSequenceHel bool MapLongLongInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22583,12 +22583,12 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22597,14 +22597,14 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::deserialize( MapLongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -22649,8 +22649,8 @@ void MapLongLongInnerAliasSequenceHelperPubSubType::delete_data( } bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22669,7 +22669,7 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22693,14 +22693,14 @@ bool MapLongLongInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22733,18 +22733,18 @@ MapLongLongInnerAliasMapHelperPubSubType::~MapLongLongInnerAliasMapHelperPubSubT bool MapLongLongInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22763,12 +22763,12 @@ bool MapLongLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22777,14 +22777,14 @@ bool MapLongLongInnerAliasMapHelperPubSubType::deserialize( MapLongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -22829,8 +22829,8 @@ void MapLongLongInnerAliasMapHelperPubSubType::delete_data( } bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22849,7 +22849,7 @@ bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -22873,14 +22873,14 @@ bool MapLongLongInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -22913,18 +22913,18 @@ MapLongLongInnerUnionHelperPubSubType::~MapLongLongInnerUnionHelperPubSubType() bool MapLongLongInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -22943,12 +22943,12 @@ bool MapLongLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -22957,14 +22957,14 @@ bool MapLongLongInnerUnionHelperPubSubType::deserialize( MapLongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23009,8 +23009,8 @@ void MapLongLongInnerUnionHelperPubSubType::delete_data( } bool MapLongLongInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23029,7 +23029,7 @@ bool MapLongLongInnerUnionHelperPubSubType::compute_key( bool MapLongLongInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23053,14 +23053,14 @@ bool MapLongLongInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23093,18 +23093,18 @@ MapLongLongInnerStructureHelperPubSubType::~MapLongLongInnerStructureHelperPubSu bool MapLongLongInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -23123,12 +23123,12 @@ bool MapLongLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -23137,14 +23137,14 @@ bool MapLongLongInnerStructureHelperPubSubType::deserialize( MapLongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23189,8 +23189,8 @@ void MapLongLongInnerStructureHelperPubSubType::delete_data( } bool MapLongLongInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23209,7 +23209,7 @@ bool MapLongLongInnerStructureHelperPubSubType::compute_key( bool MapLongLongInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23233,14 +23233,14 @@ bool MapLongLongInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23273,18 +23273,18 @@ MapLongLongInnerBitsetHelperPubSubType::~MapLongLongInnerBitsetHelperPubSubType( bool MapLongLongInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapLongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -23303,12 +23303,12 @@ bool MapLongLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapLongLongInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -23317,14 +23317,14 @@ bool MapLongLongInnerBitsetHelperPubSubType::deserialize( MapLongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23369,8 +23369,8 @@ void MapLongLongInnerBitsetHelperPubSubType::delete_data( } bool MapLongLongInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23389,7 +23389,7 @@ bool MapLongLongInnerBitsetHelperPubSubType::compute_key( bool MapLongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23413,14 +23413,14 @@ bool MapLongLongInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23453,18 +23453,18 @@ MapULongLongShortPubSubType::~MapULongLongShortPubSubType() bool MapULongLongShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -23483,12 +23483,12 @@ bool MapULongLongShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -23497,14 +23497,14 @@ bool MapULongLongShortPubSubType::deserialize( MapULongLongShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23549,8 +23549,8 @@ void MapULongLongShortPubSubType::delete_data( } bool MapULongLongShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23569,7 +23569,7 @@ bool MapULongLongShortPubSubType::compute_key( bool MapULongLongShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23593,14 +23593,14 @@ bool MapULongLongShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23633,18 +23633,18 @@ MapULongLongUShortPubSubType::~MapULongLongUShortPubSubType() bool MapULongLongUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -23663,12 +23663,12 @@ bool MapULongLongUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -23677,14 +23677,14 @@ bool MapULongLongUShortPubSubType::deserialize( MapULongLongUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23729,8 +23729,8 @@ void MapULongLongUShortPubSubType::delete_data( } bool MapULongLongUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23749,7 +23749,7 @@ bool MapULongLongUShortPubSubType::compute_key( bool MapULongLongUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23773,14 +23773,14 @@ bool MapULongLongUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23813,18 +23813,18 @@ MapULongLongLongPubSubType::~MapULongLongLongPubSubType() bool MapULongLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -23843,12 +23843,12 @@ bool MapULongLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -23857,14 +23857,14 @@ bool MapULongLongLongPubSubType::deserialize( MapULongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -23909,8 +23909,8 @@ void MapULongLongLongPubSubType::delete_data( } bool MapULongLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23929,7 +23929,7 @@ bool MapULongLongLongPubSubType::compute_key( bool MapULongLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -23953,14 +23953,14 @@ bool MapULongLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -23993,18 +23993,18 @@ MapULongLongULongPubSubType::~MapULongLongULongPubSubType() bool MapULongLongULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24023,12 +24023,12 @@ bool MapULongLongULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24037,14 +24037,14 @@ bool MapULongLongULongPubSubType::deserialize( MapULongLongULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24089,8 +24089,8 @@ void MapULongLongULongPubSubType::delete_data( } bool MapULongLongULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24109,7 +24109,7 @@ bool MapULongLongULongPubSubType::compute_key( bool MapULongLongULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24133,14 +24133,14 @@ bool MapULongLongULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -24173,18 +24173,18 @@ MapULongLongLongLongPubSubType::~MapULongLongLongLongPubSubType() bool MapULongLongLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24203,12 +24203,12 @@ bool MapULongLongLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24217,14 +24217,14 @@ bool MapULongLongLongLongPubSubType::deserialize( MapULongLongLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24269,8 +24269,8 @@ void MapULongLongLongLongPubSubType::delete_data( } bool MapULongLongLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24289,7 +24289,7 @@ bool MapULongLongLongLongPubSubType::compute_key( bool MapULongLongLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24313,14 +24313,14 @@ bool MapULongLongLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -24353,18 +24353,18 @@ MapULongLongULongLongPubSubType::~MapULongLongULongLongPubSubType() bool MapULongLongULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24383,12 +24383,12 @@ bool MapULongLongULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24397,14 +24397,14 @@ bool MapULongLongULongLongPubSubType::deserialize( MapULongLongULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24449,8 +24449,8 @@ void MapULongLongULongLongPubSubType::delete_data( } bool MapULongLongULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24469,7 +24469,7 @@ bool MapULongLongULongLongPubSubType::compute_key( bool MapULongLongULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24493,14 +24493,14 @@ bool MapULongLongULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -24533,18 +24533,18 @@ MapULongLongFloatPubSubType::~MapULongLongFloatPubSubType() bool MapULongLongFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24563,12 +24563,12 @@ bool MapULongLongFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24577,14 +24577,14 @@ bool MapULongLongFloatPubSubType::deserialize( MapULongLongFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24629,8 +24629,8 @@ void MapULongLongFloatPubSubType::delete_data( } bool MapULongLongFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24649,7 +24649,7 @@ bool MapULongLongFloatPubSubType::compute_key( bool MapULongLongFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24673,14 +24673,14 @@ bool MapULongLongFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -24713,18 +24713,18 @@ MapKeyULongLongValueDoublePubSubType::~MapKeyULongLongValueDoublePubSubType() bool MapKeyULongLongValueDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapKeyULongLongValueDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24743,12 +24743,12 @@ bool MapKeyULongLongValueDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapKeyULongLongValueDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24757,14 +24757,14 @@ bool MapKeyULongLongValueDoublePubSubType::deserialize( MapKeyULongLongValueDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24809,8 +24809,8 @@ void MapKeyULongLongValueDoublePubSubType::delete_data( } bool MapKeyULongLongValueDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24829,7 +24829,7 @@ bool MapKeyULongLongValueDoublePubSubType::compute_key( bool MapKeyULongLongValueDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -24853,14 +24853,14 @@ bool MapKeyULongLongValueDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -24893,18 +24893,18 @@ MapULongLongLongDoublePubSubType::~MapULongLongLongDoublePubSubType() bool MapULongLongLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -24923,12 +24923,12 @@ bool MapULongLongLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -24937,14 +24937,14 @@ bool MapULongLongLongDoublePubSubType::deserialize( MapULongLongLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -24989,8 +24989,8 @@ void MapULongLongLongDoublePubSubType::delete_data( } bool MapULongLongLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25009,7 +25009,7 @@ bool MapULongLongLongDoublePubSubType::compute_key( bool MapULongLongLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25033,14 +25033,14 @@ bool MapULongLongLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25073,18 +25073,18 @@ MapULongLongBooleanPubSubType::~MapULongLongBooleanPubSubType() bool MapULongLongBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -25103,12 +25103,12 @@ bool MapULongLongBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -25117,14 +25117,14 @@ bool MapULongLongBooleanPubSubType::deserialize( MapULongLongBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -25169,8 +25169,8 @@ void MapULongLongBooleanPubSubType::delete_data( } bool MapULongLongBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25189,7 +25189,7 @@ bool MapULongLongBooleanPubSubType::compute_key( bool MapULongLongBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25213,14 +25213,14 @@ bool MapULongLongBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25253,18 +25253,18 @@ MapULongLongOctetPubSubType::~MapULongLongOctetPubSubType() bool MapULongLongOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -25283,12 +25283,12 @@ bool MapULongLongOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -25297,14 +25297,14 @@ bool MapULongLongOctetPubSubType::deserialize( MapULongLongOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -25349,8 +25349,8 @@ void MapULongLongOctetPubSubType::delete_data( } bool MapULongLongOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25369,7 +25369,7 @@ bool MapULongLongOctetPubSubType::compute_key( bool MapULongLongOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25393,14 +25393,14 @@ bool MapULongLongOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25433,18 +25433,18 @@ MapULongLongCharPubSubType::~MapULongLongCharPubSubType() bool MapULongLongCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -25463,12 +25463,12 @@ bool MapULongLongCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -25477,14 +25477,14 @@ bool MapULongLongCharPubSubType::deserialize( MapULongLongChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -25529,8 +25529,8 @@ void MapULongLongCharPubSubType::delete_data( } bool MapULongLongCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25549,7 +25549,7 @@ bool MapULongLongCharPubSubType::compute_key( bool MapULongLongCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25573,14 +25573,14 @@ bool MapULongLongCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25613,18 +25613,18 @@ MapULongLongWCharPubSubType::~MapULongLongWCharPubSubType() bool MapULongLongWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -25643,12 +25643,12 @@ bool MapULongLongWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -25657,14 +25657,14 @@ bool MapULongLongWCharPubSubType::deserialize( MapULongLongWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -25709,8 +25709,8 @@ void MapULongLongWCharPubSubType::delete_data( } bool MapULongLongWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25729,7 +25729,7 @@ bool MapULongLongWCharPubSubType::compute_key( bool MapULongLongWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25753,14 +25753,14 @@ bool MapULongLongWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25793,18 +25793,18 @@ MapULongLongStringPubSubType::~MapULongLongStringPubSubType() bool MapULongLongStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -25823,12 +25823,12 @@ bool MapULongLongStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -25837,14 +25837,14 @@ bool MapULongLongStringPubSubType::deserialize( MapULongLongString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -25889,8 +25889,8 @@ void MapULongLongStringPubSubType::delete_data( } bool MapULongLongStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25909,7 +25909,7 @@ bool MapULongLongStringPubSubType::compute_key( bool MapULongLongStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -25933,14 +25933,14 @@ bool MapULongLongStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -25973,18 +25973,18 @@ MapULongLongWStringPubSubType::~MapULongLongWStringPubSubType() bool MapULongLongWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26003,12 +26003,12 @@ bool MapULongLongWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26017,14 +26017,14 @@ bool MapULongLongWStringPubSubType::deserialize( MapULongLongWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26069,8 +26069,8 @@ void MapULongLongWStringPubSubType::delete_data( } bool MapULongLongWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26089,7 +26089,7 @@ bool MapULongLongWStringPubSubType::compute_key( bool MapULongLongWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26113,14 +26113,14 @@ bool MapULongLongWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -26153,18 +26153,18 @@ MapULongLongInnerAliasBoundedStringHelperPubSubType::~MapULongLongInnerAliasBoun bool MapULongLongInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26183,12 +26183,12 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26197,14 +26197,14 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::deserialize( MapULongLongInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26249,8 +26249,8 @@ void MapULongLongInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26269,7 +26269,7 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26293,14 +26293,14 @@ bool MapULongLongInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -26333,18 +26333,18 @@ MapULongLongInnerAliasBoundedWStringHelperPubSubType::~MapULongLongInnerAliasBou bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26363,12 +26363,12 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26377,14 +26377,14 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::deserialize( MapULongLongInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26429,8 +26429,8 @@ void MapULongLongInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26449,7 +26449,7 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26473,14 +26473,14 @@ bool MapULongLongInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -26513,18 +26513,18 @@ MapULongLongInnerEnumHelperPubSubType::~MapULongLongInnerEnumHelperPubSubType() bool MapULongLongInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26543,12 +26543,12 @@ bool MapULongLongInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26557,14 +26557,14 @@ bool MapULongLongInnerEnumHelperPubSubType::deserialize( MapULongLongInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26609,8 +26609,8 @@ void MapULongLongInnerEnumHelperPubSubType::delete_data( } bool MapULongLongInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26629,7 +26629,7 @@ bool MapULongLongInnerEnumHelperPubSubType::compute_key( bool MapULongLongInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26653,14 +26653,14 @@ bool MapULongLongInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -26693,18 +26693,18 @@ MapULongLongInnerBitMaskHelperPubSubType::~MapULongLongInnerBitMaskHelperPubSubT bool MapULongLongInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26723,12 +26723,12 @@ bool MapULongLongInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26737,14 +26737,14 @@ bool MapULongLongInnerBitMaskHelperPubSubType::deserialize( MapULongLongInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26789,8 +26789,8 @@ void MapULongLongInnerBitMaskHelperPubSubType::delete_data( } bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26809,7 +26809,7 @@ bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26833,14 +26833,14 @@ bool MapULongLongInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -26873,18 +26873,18 @@ MapULongLongInnerAliasHelperPubSubType::~MapULongLongInnerAliasHelperPubSubType( bool MapULongLongInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -26903,12 +26903,12 @@ bool MapULongLongInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -26917,14 +26917,14 @@ bool MapULongLongInnerAliasHelperPubSubType::deserialize( MapULongLongInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -26969,8 +26969,8 @@ void MapULongLongInnerAliasHelperPubSubType::delete_data( } bool MapULongLongInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -26989,7 +26989,7 @@ bool MapULongLongInnerAliasHelperPubSubType::compute_key( bool MapULongLongInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27013,14 +27013,14 @@ bool MapULongLongInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27053,18 +27053,18 @@ MapULongLongInnerAliasArrayHelperPubSubType::~MapULongLongInnerAliasArrayHelperP bool MapULongLongInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27083,12 +27083,12 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27097,14 +27097,14 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::deserialize( MapULongLongInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -27149,8 +27149,8 @@ void MapULongLongInnerAliasArrayHelperPubSubType::delete_data( } bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27169,7 +27169,7 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27193,14 +27193,14 @@ bool MapULongLongInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27233,18 +27233,18 @@ MapULongLongInnerAliasSequenceHelperPubSubType::~MapULongLongInnerAliasSequenceH bool MapULongLongInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27263,12 +27263,12 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27277,14 +27277,14 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::deserialize( MapULongLongInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -27329,8 +27329,8 @@ void MapULongLongInnerAliasSequenceHelperPubSubType::delete_data( } bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27349,7 +27349,7 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27373,14 +27373,14 @@ bool MapULongLongInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27413,18 +27413,18 @@ MapULongLongInnerAliasMapHelperPubSubType::~MapULongLongInnerAliasMapHelperPubSu bool MapULongLongInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27443,12 +27443,12 @@ bool MapULongLongInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27457,14 +27457,14 @@ bool MapULongLongInnerAliasMapHelperPubSubType::deserialize( MapULongLongInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -27509,8 +27509,8 @@ void MapULongLongInnerAliasMapHelperPubSubType::delete_data( } bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27529,7 +27529,7 @@ bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27553,14 +27553,14 @@ bool MapULongLongInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27593,18 +27593,18 @@ MapULongLongInnerUnionHelperPubSubType::~MapULongLongInnerUnionHelperPubSubType( bool MapULongLongInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27623,12 +27623,12 @@ bool MapULongLongInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27637,14 +27637,14 @@ bool MapULongLongInnerUnionHelperPubSubType::deserialize( MapULongLongInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -27689,8 +27689,8 @@ void MapULongLongInnerUnionHelperPubSubType::delete_data( } bool MapULongLongInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27709,7 +27709,7 @@ bool MapULongLongInnerUnionHelperPubSubType::compute_key( bool MapULongLongInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27733,14 +27733,14 @@ bool MapULongLongInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27773,18 +27773,18 @@ MapULongLongInnerStructureHelperPubSubType::~MapULongLongInnerStructureHelperPub bool MapULongLongInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27803,12 +27803,12 @@ bool MapULongLongInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27817,14 +27817,14 @@ bool MapULongLongInnerStructureHelperPubSubType::deserialize( MapULongLongInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -27869,8 +27869,8 @@ void MapULongLongInnerStructureHelperPubSubType::delete_data( } bool MapULongLongInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27889,7 +27889,7 @@ bool MapULongLongInnerStructureHelperPubSubType::compute_key( bool MapULongLongInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -27913,14 +27913,14 @@ bool MapULongLongInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -27953,18 +27953,18 @@ MapULongLongInnerBitsetHelperPubSubType::~MapULongLongInnerBitsetHelperPubSubTyp bool MapULongLongInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapULongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -27983,12 +27983,12 @@ bool MapULongLongInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapULongLongInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -27997,14 +27997,14 @@ bool MapULongLongInnerBitsetHelperPubSubType::deserialize( MapULongLongInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28049,8 +28049,8 @@ void MapULongLongInnerBitsetHelperPubSubType::delete_data( } bool MapULongLongInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28069,7 +28069,7 @@ bool MapULongLongInnerBitsetHelperPubSubType::compute_key( bool MapULongLongInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28093,14 +28093,14 @@ bool MapULongLongInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -28133,18 +28133,18 @@ MapStringShortPubSubType::~MapStringShortPubSubType() bool MapStringShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -28163,12 +28163,12 @@ bool MapStringShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -28177,14 +28177,14 @@ bool MapStringShortPubSubType::deserialize( MapStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28229,8 +28229,8 @@ void MapStringShortPubSubType::delete_data( } bool MapStringShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28249,7 +28249,7 @@ bool MapStringShortPubSubType::compute_key( bool MapStringShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28273,14 +28273,14 @@ bool MapStringShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -28313,18 +28313,18 @@ MapStringUShortPubSubType::~MapStringUShortPubSubType() bool MapStringUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -28343,12 +28343,12 @@ bool MapStringUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -28357,14 +28357,14 @@ bool MapStringUShortPubSubType::deserialize( MapStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28409,8 +28409,8 @@ void MapStringUShortPubSubType::delete_data( } bool MapStringUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28429,7 +28429,7 @@ bool MapStringUShortPubSubType::compute_key( bool MapStringUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28453,14 +28453,14 @@ bool MapStringUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -28493,18 +28493,18 @@ MapStringLongPubSubType::~MapStringLongPubSubType() bool MapStringLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -28523,12 +28523,12 @@ bool MapStringLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -28537,14 +28537,14 @@ bool MapStringLongPubSubType::deserialize( MapStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28589,8 +28589,8 @@ void MapStringLongPubSubType::delete_data( } bool MapStringLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28609,7 +28609,7 @@ bool MapStringLongPubSubType::compute_key( bool MapStringLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28633,14 +28633,14 @@ bool MapStringLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -28673,18 +28673,18 @@ MapStringULongPubSubType::~MapStringULongPubSubType() bool MapStringULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -28703,12 +28703,12 @@ bool MapStringULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -28717,14 +28717,14 @@ bool MapStringULongPubSubType::deserialize( MapStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28769,8 +28769,8 @@ void MapStringULongPubSubType::delete_data( } bool MapStringULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28789,7 +28789,7 @@ bool MapStringULongPubSubType::compute_key( bool MapStringULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28813,14 +28813,14 @@ bool MapStringULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -28853,18 +28853,18 @@ MapStringLongLongPubSubType::~MapStringLongLongPubSubType() bool MapStringLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -28883,12 +28883,12 @@ bool MapStringLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -28897,14 +28897,14 @@ bool MapStringLongLongPubSubType::deserialize( MapStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -28949,8 +28949,8 @@ void MapStringLongLongPubSubType::delete_data( } bool MapStringLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28969,7 +28969,7 @@ bool MapStringLongLongPubSubType::compute_key( bool MapStringLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -28993,14 +28993,14 @@ bool MapStringLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29033,18 +29033,18 @@ MapStringULongLongPubSubType::~MapStringULongLongPubSubType() bool MapStringULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29063,12 +29063,12 @@ bool MapStringULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29077,14 +29077,14 @@ bool MapStringULongLongPubSubType::deserialize( MapStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -29129,8 +29129,8 @@ void MapStringULongLongPubSubType::delete_data( } bool MapStringULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29149,7 +29149,7 @@ bool MapStringULongLongPubSubType::compute_key( bool MapStringULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29173,14 +29173,14 @@ bool MapStringULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29213,18 +29213,18 @@ MapStringFloatPubSubType::~MapStringFloatPubSubType() bool MapStringFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29243,12 +29243,12 @@ bool MapStringFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29257,14 +29257,14 @@ bool MapStringFloatPubSubType::deserialize( MapStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -29309,8 +29309,8 @@ void MapStringFloatPubSubType::delete_data( } bool MapStringFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29329,7 +29329,7 @@ bool MapStringFloatPubSubType::compute_key( bool MapStringFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29353,14 +29353,14 @@ bool MapStringFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29393,18 +29393,18 @@ MapStringDoublePubSubType::~MapStringDoublePubSubType() bool MapStringDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29423,12 +29423,12 @@ bool MapStringDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29437,14 +29437,14 @@ bool MapStringDoublePubSubType::deserialize( MapStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -29489,8 +29489,8 @@ void MapStringDoublePubSubType::delete_data( } bool MapStringDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29509,7 +29509,7 @@ bool MapStringDoublePubSubType::compute_key( bool MapStringDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29533,14 +29533,14 @@ bool MapStringDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29573,18 +29573,18 @@ MapStringLongDoublePubSubType::~MapStringLongDoublePubSubType() bool MapStringLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29603,12 +29603,12 @@ bool MapStringLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29617,14 +29617,14 @@ bool MapStringLongDoublePubSubType::deserialize( MapStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -29669,8 +29669,8 @@ void MapStringLongDoublePubSubType::delete_data( } bool MapStringLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29689,7 +29689,7 @@ bool MapStringLongDoublePubSubType::compute_key( bool MapStringLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29713,14 +29713,14 @@ bool MapStringLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29753,18 +29753,18 @@ MapStringBooleanPubSubType::~MapStringBooleanPubSubType() bool MapStringBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29783,12 +29783,12 @@ bool MapStringBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29797,14 +29797,14 @@ bool MapStringBooleanPubSubType::deserialize( MapStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -29849,8 +29849,8 @@ void MapStringBooleanPubSubType::delete_data( } bool MapStringBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29869,7 +29869,7 @@ bool MapStringBooleanPubSubType::compute_key( bool MapStringBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -29893,14 +29893,14 @@ bool MapStringBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -29933,18 +29933,18 @@ MapStringOctetPubSubType::~MapStringOctetPubSubType() bool MapStringOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -29963,12 +29963,12 @@ bool MapStringOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -29977,14 +29977,14 @@ bool MapStringOctetPubSubType::deserialize( MapStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30029,8 +30029,8 @@ void MapStringOctetPubSubType::delete_data( } bool MapStringOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30049,7 +30049,7 @@ bool MapStringOctetPubSubType::compute_key( bool MapStringOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30073,14 +30073,14 @@ bool MapStringOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -30113,18 +30113,18 @@ MapStringCharPubSubType::~MapStringCharPubSubType() bool MapStringCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -30143,12 +30143,12 @@ bool MapStringCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -30157,14 +30157,14 @@ bool MapStringCharPubSubType::deserialize( MapStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30209,8 +30209,8 @@ void MapStringCharPubSubType::delete_data( } bool MapStringCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30229,7 +30229,7 @@ bool MapStringCharPubSubType::compute_key( bool MapStringCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30253,14 +30253,14 @@ bool MapStringCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -30293,18 +30293,18 @@ MapStringWCharPubSubType::~MapStringWCharPubSubType() bool MapStringWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -30323,12 +30323,12 @@ bool MapStringWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -30337,14 +30337,14 @@ bool MapStringWCharPubSubType::deserialize( MapStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30389,8 +30389,8 @@ void MapStringWCharPubSubType::delete_data( } bool MapStringWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30409,7 +30409,7 @@ bool MapStringWCharPubSubType::compute_key( bool MapStringWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30433,14 +30433,14 @@ bool MapStringWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -30473,18 +30473,18 @@ MapStringStringPubSubType::~MapStringStringPubSubType() bool MapStringStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -30503,12 +30503,12 @@ bool MapStringStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -30517,14 +30517,14 @@ bool MapStringStringPubSubType::deserialize( MapStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30569,8 +30569,8 @@ void MapStringStringPubSubType::delete_data( } bool MapStringStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30589,7 +30589,7 @@ bool MapStringStringPubSubType::compute_key( bool MapStringStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30613,14 +30613,14 @@ bool MapStringStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -30653,18 +30653,18 @@ MapStringWStringPubSubType::~MapStringWStringPubSubType() bool MapStringWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -30683,12 +30683,12 @@ bool MapStringWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -30697,14 +30697,14 @@ bool MapStringWStringPubSubType::deserialize( MapStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30749,8 +30749,8 @@ void MapStringWStringPubSubType::delete_data( } bool MapStringWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30769,7 +30769,7 @@ bool MapStringWStringPubSubType::compute_key( bool MapStringWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30793,14 +30793,14 @@ bool MapStringWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -30833,18 +30833,18 @@ MapStringInnerAliasBoundedStringHelperPubSubType::~MapStringInnerAliasBoundedStr bool MapStringInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -30863,12 +30863,12 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -30877,14 +30877,14 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::deserialize( MapStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -30929,8 +30929,8 @@ void MapStringInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30949,7 +30949,7 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -30973,14 +30973,14 @@ bool MapStringInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31013,18 +31013,18 @@ MapStringInnerAliasBoundedWStringHelperPubSubType::~MapStringInnerAliasBoundedWS bool MapStringInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31043,12 +31043,12 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31057,14 +31057,14 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::deserialize( MapStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -31109,8 +31109,8 @@ void MapStringInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31129,7 +31129,7 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31153,14 +31153,14 @@ bool MapStringInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31193,18 +31193,18 @@ MapStringInnerEnumHelperPubSubType::~MapStringInnerEnumHelperPubSubType() bool MapStringInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31223,12 +31223,12 @@ bool MapStringInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31237,14 +31237,14 @@ bool MapStringInnerEnumHelperPubSubType::deserialize( MapStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -31289,8 +31289,8 @@ void MapStringInnerEnumHelperPubSubType::delete_data( } bool MapStringInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31309,7 +31309,7 @@ bool MapStringInnerEnumHelperPubSubType::compute_key( bool MapStringInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31333,14 +31333,14 @@ bool MapStringInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31373,18 +31373,18 @@ MapStringInnerBitMaskHelperPubSubType::~MapStringInnerBitMaskHelperPubSubType() bool MapStringInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31403,12 +31403,12 @@ bool MapStringInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31417,14 +31417,14 @@ bool MapStringInnerBitMaskHelperPubSubType::deserialize( MapStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -31469,8 +31469,8 @@ void MapStringInnerBitMaskHelperPubSubType::delete_data( } bool MapStringInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31489,7 +31489,7 @@ bool MapStringInnerBitMaskHelperPubSubType::compute_key( bool MapStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31513,14 +31513,14 @@ bool MapStringInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31553,18 +31553,18 @@ MapStringInnerAliasHelperPubSubType::~MapStringInnerAliasHelperPubSubType() bool MapStringInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31583,12 +31583,12 @@ bool MapStringInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31597,14 +31597,14 @@ bool MapStringInnerAliasHelperPubSubType::deserialize( MapStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -31649,8 +31649,8 @@ void MapStringInnerAliasHelperPubSubType::delete_data( } bool MapStringInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31669,7 +31669,7 @@ bool MapStringInnerAliasHelperPubSubType::compute_key( bool MapStringInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31693,14 +31693,14 @@ bool MapStringInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31733,18 +31733,18 @@ MapStringInnerAliasArrayHelperPubSubType::~MapStringInnerAliasArrayHelperPubSubT bool MapStringInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31763,12 +31763,12 @@ bool MapStringInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31777,14 +31777,14 @@ bool MapStringInnerAliasArrayHelperPubSubType::deserialize( MapStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -31829,8 +31829,8 @@ void MapStringInnerAliasArrayHelperPubSubType::delete_data( } bool MapStringInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31849,7 +31849,7 @@ bool MapStringInnerAliasArrayHelperPubSubType::compute_key( bool MapStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -31873,14 +31873,14 @@ bool MapStringInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -31913,18 +31913,18 @@ MapStringInnerAliasSequenceHelperPubSubType::~MapStringInnerAliasSequenceHelperP bool MapStringInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -31943,12 +31943,12 @@ bool MapStringInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -31957,14 +31957,14 @@ bool MapStringInnerAliasSequenceHelperPubSubType::deserialize( MapStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32009,8 +32009,8 @@ void MapStringInnerAliasSequenceHelperPubSubType::delete_data( } bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32029,7 +32029,7 @@ bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32053,14 +32053,14 @@ bool MapStringInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32093,18 +32093,18 @@ MapStringInnerAliasMapHelperPubSubType::~MapStringInnerAliasMapHelperPubSubType( bool MapStringInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -32123,12 +32123,12 @@ bool MapStringInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -32137,14 +32137,14 @@ bool MapStringInnerAliasMapHelperPubSubType::deserialize( MapStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32189,8 +32189,8 @@ void MapStringInnerAliasMapHelperPubSubType::delete_data( } bool MapStringInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32209,7 +32209,7 @@ bool MapStringInnerAliasMapHelperPubSubType::compute_key( bool MapStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32233,14 +32233,14 @@ bool MapStringInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32273,18 +32273,18 @@ MapStringInnerUnionHelperPubSubType::~MapStringInnerUnionHelperPubSubType() bool MapStringInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -32303,12 +32303,12 @@ bool MapStringInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -32317,14 +32317,14 @@ bool MapStringInnerUnionHelperPubSubType::deserialize( MapStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32369,8 +32369,8 @@ void MapStringInnerUnionHelperPubSubType::delete_data( } bool MapStringInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32389,7 +32389,7 @@ bool MapStringInnerUnionHelperPubSubType::compute_key( bool MapStringInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32413,14 +32413,14 @@ bool MapStringInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32453,18 +32453,18 @@ MapStringInnerStructureHelperPubSubType::~MapStringInnerStructureHelperPubSubTyp bool MapStringInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -32483,12 +32483,12 @@ bool MapStringInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -32497,14 +32497,14 @@ bool MapStringInnerStructureHelperPubSubType::deserialize( MapStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32549,8 +32549,8 @@ void MapStringInnerStructureHelperPubSubType::delete_data( } bool MapStringInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32569,7 +32569,7 @@ bool MapStringInnerStructureHelperPubSubType::compute_key( bool MapStringInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32593,14 +32593,14 @@ bool MapStringInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32633,18 +32633,18 @@ MapStringInnerBitsetHelperPubSubType::~MapStringInnerBitsetHelperPubSubType() bool MapStringInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -32663,12 +32663,12 @@ bool MapStringInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStringInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -32677,14 +32677,14 @@ bool MapStringInnerBitsetHelperPubSubType::deserialize( MapStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32729,8 +32729,8 @@ void MapStringInnerBitsetHelperPubSubType::delete_data( } bool MapStringInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32749,7 +32749,7 @@ bool MapStringInnerBitsetHelperPubSubType::compute_key( bool MapStringInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32773,14 +32773,14 @@ bool MapStringInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32813,18 +32813,18 @@ MapWStringShortPubSubType::~MapWStringShortPubSubType() bool MapWStringShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -32843,12 +32843,12 @@ bool MapWStringShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -32857,14 +32857,14 @@ bool MapWStringShortPubSubType::deserialize( MapWStringShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -32909,8 +32909,8 @@ void MapWStringShortPubSubType::delete_data( } bool MapWStringShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32929,7 +32929,7 @@ bool MapWStringShortPubSubType::compute_key( bool MapWStringShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -32953,14 +32953,14 @@ bool MapWStringShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -32993,18 +32993,18 @@ MapWStringUShortPubSubType::~MapWStringUShortPubSubType() bool MapWStringUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33023,12 +33023,12 @@ bool MapWStringUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33037,14 +33037,14 @@ bool MapWStringUShortPubSubType::deserialize( MapWStringUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33089,8 +33089,8 @@ void MapWStringUShortPubSubType::delete_data( } bool MapWStringUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33109,7 +33109,7 @@ bool MapWStringUShortPubSubType::compute_key( bool MapWStringUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33133,14 +33133,14 @@ bool MapWStringUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -33173,18 +33173,18 @@ MapWStringLongPubSubType::~MapWStringLongPubSubType() bool MapWStringLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33203,12 +33203,12 @@ bool MapWStringLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33217,14 +33217,14 @@ bool MapWStringLongPubSubType::deserialize( MapWStringLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33269,8 +33269,8 @@ void MapWStringLongPubSubType::delete_data( } bool MapWStringLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33289,7 +33289,7 @@ bool MapWStringLongPubSubType::compute_key( bool MapWStringLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33313,14 +33313,14 @@ bool MapWStringLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -33353,18 +33353,18 @@ MapWStringULongPubSubType::~MapWStringULongPubSubType() bool MapWStringULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33383,12 +33383,12 @@ bool MapWStringULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33397,14 +33397,14 @@ bool MapWStringULongPubSubType::deserialize( MapWStringULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33449,8 +33449,8 @@ void MapWStringULongPubSubType::delete_data( } bool MapWStringULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33469,7 +33469,7 @@ bool MapWStringULongPubSubType::compute_key( bool MapWStringULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33493,14 +33493,14 @@ bool MapWStringULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -33533,18 +33533,18 @@ MapWStringLongLongPubSubType::~MapWStringLongLongPubSubType() bool MapWStringLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33563,12 +33563,12 @@ bool MapWStringLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33577,14 +33577,14 @@ bool MapWStringLongLongPubSubType::deserialize( MapWStringLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33629,8 +33629,8 @@ void MapWStringLongLongPubSubType::delete_data( } bool MapWStringLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33649,7 +33649,7 @@ bool MapWStringLongLongPubSubType::compute_key( bool MapWStringLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33673,14 +33673,14 @@ bool MapWStringLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -33713,18 +33713,18 @@ MapWStringULongLongPubSubType::~MapWStringULongLongPubSubType() bool MapWStringULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33743,12 +33743,12 @@ bool MapWStringULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33757,14 +33757,14 @@ bool MapWStringULongLongPubSubType::deserialize( MapWStringULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33809,8 +33809,8 @@ void MapWStringULongLongPubSubType::delete_data( } bool MapWStringULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33829,7 +33829,7 @@ bool MapWStringULongLongPubSubType::compute_key( bool MapWStringULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -33853,14 +33853,14 @@ bool MapWStringULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -33893,18 +33893,18 @@ MapWStringFloatPubSubType::~MapWStringFloatPubSubType() bool MapWStringFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -33923,12 +33923,12 @@ bool MapWStringFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -33937,14 +33937,14 @@ bool MapWStringFloatPubSubType::deserialize( MapWStringFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -33989,8 +33989,8 @@ void MapWStringFloatPubSubType::delete_data( } bool MapWStringFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34009,7 +34009,7 @@ bool MapWStringFloatPubSubType::compute_key( bool MapWStringFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34033,14 +34033,14 @@ bool MapWStringFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34073,18 +34073,18 @@ MapWStringDoublePubSubType::~MapWStringDoublePubSubType() bool MapWStringDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -34103,12 +34103,12 @@ bool MapWStringDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -34117,14 +34117,14 @@ bool MapWStringDoublePubSubType::deserialize( MapWStringDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -34169,8 +34169,8 @@ void MapWStringDoublePubSubType::delete_data( } bool MapWStringDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34189,7 +34189,7 @@ bool MapWStringDoublePubSubType::compute_key( bool MapWStringDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34213,14 +34213,14 @@ bool MapWStringDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34253,18 +34253,18 @@ MapWStringLongDoublePubSubType::~MapWStringLongDoublePubSubType() bool MapWStringLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -34283,12 +34283,12 @@ bool MapWStringLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -34297,14 +34297,14 @@ bool MapWStringLongDoublePubSubType::deserialize( MapWStringLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -34349,8 +34349,8 @@ void MapWStringLongDoublePubSubType::delete_data( } bool MapWStringLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34369,7 +34369,7 @@ bool MapWStringLongDoublePubSubType::compute_key( bool MapWStringLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34393,14 +34393,14 @@ bool MapWStringLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34433,18 +34433,18 @@ MapWStringBooleanPubSubType::~MapWStringBooleanPubSubType() bool MapWStringBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -34463,12 +34463,12 @@ bool MapWStringBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -34477,14 +34477,14 @@ bool MapWStringBooleanPubSubType::deserialize( MapWStringBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -34529,8 +34529,8 @@ void MapWStringBooleanPubSubType::delete_data( } bool MapWStringBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34549,7 +34549,7 @@ bool MapWStringBooleanPubSubType::compute_key( bool MapWStringBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34573,14 +34573,14 @@ bool MapWStringBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34613,18 +34613,18 @@ MapWStringOctetPubSubType::~MapWStringOctetPubSubType() bool MapWStringOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -34643,12 +34643,12 @@ bool MapWStringOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -34657,14 +34657,14 @@ bool MapWStringOctetPubSubType::deserialize( MapWStringOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -34709,8 +34709,8 @@ void MapWStringOctetPubSubType::delete_data( } bool MapWStringOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34729,7 +34729,7 @@ bool MapWStringOctetPubSubType::compute_key( bool MapWStringOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34753,14 +34753,14 @@ bool MapWStringOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34793,18 +34793,18 @@ MapWStringCharPubSubType::~MapWStringCharPubSubType() bool MapWStringCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -34823,12 +34823,12 @@ bool MapWStringCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -34837,14 +34837,14 @@ bool MapWStringCharPubSubType::deserialize( MapWStringChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -34889,8 +34889,8 @@ void MapWStringCharPubSubType::delete_data( } bool MapWStringCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34909,7 +34909,7 @@ bool MapWStringCharPubSubType::compute_key( bool MapWStringCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -34933,14 +34933,14 @@ bool MapWStringCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -34973,18 +34973,18 @@ MapWStringWCharPubSubType::~MapWStringWCharPubSubType() bool MapWStringWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35003,12 +35003,12 @@ bool MapWStringWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35017,14 +35017,14 @@ bool MapWStringWCharPubSubType::deserialize( MapWStringWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35069,8 +35069,8 @@ void MapWStringWCharPubSubType::delete_data( } bool MapWStringWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35089,7 +35089,7 @@ bool MapWStringWCharPubSubType::compute_key( bool MapWStringWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35113,14 +35113,14 @@ bool MapWStringWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -35153,18 +35153,18 @@ MapWStringStringPubSubType::~MapWStringStringPubSubType() bool MapWStringStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35183,12 +35183,12 @@ bool MapWStringStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35197,14 +35197,14 @@ bool MapWStringStringPubSubType::deserialize( MapWStringString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35249,8 +35249,8 @@ void MapWStringStringPubSubType::delete_data( } bool MapWStringStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35269,7 +35269,7 @@ bool MapWStringStringPubSubType::compute_key( bool MapWStringStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35293,14 +35293,14 @@ bool MapWStringStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -35333,18 +35333,18 @@ MapWStringWStringPubSubType::~MapWStringWStringPubSubType() bool MapWStringWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35363,12 +35363,12 @@ bool MapWStringWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35377,14 +35377,14 @@ bool MapWStringWStringPubSubType::deserialize( MapWStringWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35429,8 +35429,8 @@ void MapWStringWStringPubSubType::delete_data( } bool MapWStringWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35449,7 +35449,7 @@ bool MapWStringWStringPubSubType::compute_key( bool MapWStringWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35473,14 +35473,14 @@ bool MapWStringWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -35513,18 +35513,18 @@ MapWStringInnerAliasBoundedStringHelperPubSubType::~MapWStringInnerAliasBoundedS bool MapWStringInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35543,12 +35543,12 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35557,14 +35557,14 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::deserialize( MapWStringInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35609,8 +35609,8 @@ void MapWStringInnerAliasBoundedStringHelperPubSubType::delete_data( } bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35629,7 +35629,7 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35653,14 +35653,14 @@ bool MapWStringInnerAliasBoundedStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -35693,18 +35693,18 @@ MapWStringInnerAliasBoundedWStringHelperPubSubType::~MapWStringInnerAliasBounded bool MapWStringInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35723,12 +35723,12 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35737,14 +35737,14 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::deserialize( MapWStringInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35789,8 +35789,8 @@ void MapWStringInnerAliasBoundedWStringHelperPubSubType::delete_data( } bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35809,7 +35809,7 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35833,14 +35833,14 @@ bool MapWStringInnerAliasBoundedWStringHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -35873,18 +35873,18 @@ MapWStringInnerEnumHelperPubSubType::~MapWStringInnerEnumHelperPubSubType() bool MapWStringInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -35903,12 +35903,12 @@ bool MapWStringInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -35917,14 +35917,14 @@ bool MapWStringInnerEnumHelperPubSubType::deserialize( MapWStringInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -35969,8 +35969,8 @@ void MapWStringInnerEnumHelperPubSubType::delete_data( } bool MapWStringInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -35989,7 +35989,7 @@ bool MapWStringInnerEnumHelperPubSubType::compute_key( bool MapWStringInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36013,14 +36013,14 @@ bool MapWStringInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36053,18 +36053,18 @@ MapWStringInnerBitMaskHelperPubSubType::~MapWStringInnerBitMaskHelperPubSubType( bool MapWStringInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36083,12 +36083,12 @@ bool MapWStringInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36097,14 +36097,14 @@ bool MapWStringInnerBitMaskHelperPubSubType::deserialize( MapWStringInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -36149,8 +36149,8 @@ void MapWStringInnerBitMaskHelperPubSubType::delete_data( } bool MapWStringInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36169,7 +36169,7 @@ bool MapWStringInnerBitMaskHelperPubSubType::compute_key( bool MapWStringInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36193,14 +36193,14 @@ bool MapWStringInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36233,18 +36233,18 @@ MapWStringInnerAliasHelperPubSubType::~MapWStringInnerAliasHelperPubSubType() bool MapWStringInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36263,12 +36263,12 @@ bool MapWStringInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36277,14 +36277,14 @@ bool MapWStringInnerAliasHelperPubSubType::deserialize( MapWStringInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -36329,8 +36329,8 @@ void MapWStringInnerAliasHelperPubSubType::delete_data( } bool MapWStringInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36349,7 +36349,7 @@ bool MapWStringInnerAliasHelperPubSubType::compute_key( bool MapWStringInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36373,14 +36373,14 @@ bool MapWStringInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36413,18 +36413,18 @@ MapWStringInnerAliasArrayHelperPubSubType::~MapWStringInnerAliasArrayHelperPubSu bool MapWStringInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36443,12 +36443,12 @@ bool MapWStringInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36457,14 +36457,14 @@ bool MapWStringInnerAliasArrayHelperPubSubType::deserialize( MapWStringInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -36509,8 +36509,8 @@ void MapWStringInnerAliasArrayHelperPubSubType::delete_data( } bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36529,7 +36529,7 @@ bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36553,14 +36553,14 @@ bool MapWStringInnerAliasArrayHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36593,18 +36593,18 @@ MapWStringInnerAliasSequenceHelperPubSubType::~MapWStringInnerAliasSequenceHelpe bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36623,12 +36623,12 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36637,14 +36637,14 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::deserialize( MapWStringInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -36689,8 +36689,8 @@ void MapWStringInnerAliasSequenceHelperPubSubType::delete_data( } bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36709,7 +36709,7 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36733,14 +36733,14 @@ bool MapWStringInnerAliasSequenceHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36773,18 +36773,18 @@ MapWStringInnerAliasMapHelperPubSubType::~MapWStringInnerAliasMapHelperPubSubTyp bool MapWStringInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36803,12 +36803,12 @@ bool MapWStringInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36817,14 +36817,14 @@ bool MapWStringInnerAliasMapHelperPubSubType::deserialize( MapWStringInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -36869,8 +36869,8 @@ void MapWStringInnerAliasMapHelperPubSubType::delete_data( } bool MapWStringInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36889,7 +36889,7 @@ bool MapWStringInnerAliasMapHelperPubSubType::compute_key( bool MapWStringInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -36913,14 +36913,14 @@ bool MapWStringInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -36953,18 +36953,18 @@ MapWStringInnerUnionHelperPubSubType::~MapWStringInnerUnionHelperPubSubType() bool MapWStringInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -36983,12 +36983,12 @@ bool MapWStringInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -36997,14 +36997,14 @@ bool MapWStringInnerUnionHelperPubSubType::deserialize( MapWStringInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37049,8 +37049,8 @@ void MapWStringInnerUnionHelperPubSubType::delete_data( } bool MapWStringInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37069,7 +37069,7 @@ bool MapWStringInnerUnionHelperPubSubType::compute_key( bool MapWStringInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37093,14 +37093,14 @@ bool MapWStringInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -37133,18 +37133,18 @@ MapWStringInnerStructureHelperPubSubType::~MapWStringInnerStructureHelperPubSubT bool MapWStringInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -37163,12 +37163,12 @@ bool MapWStringInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -37177,14 +37177,14 @@ bool MapWStringInnerStructureHelperPubSubType::deserialize( MapWStringInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37229,8 +37229,8 @@ void MapWStringInnerStructureHelperPubSubType::delete_data( } bool MapWStringInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37249,7 +37249,7 @@ bool MapWStringInnerStructureHelperPubSubType::compute_key( bool MapWStringInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37273,14 +37273,14 @@ bool MapWStringInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -37313,18 +37313,18 @@ MapWStringInnerBitsetHelperPubSubType::~MapWStringInnerBitsetHelperPubSubType() bool MapWStringInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapWStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -37343,12 +37343,12 @@ bool MapWStringInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapWStringInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -37357,14 +37357,14 @@ bool MapWStringInnerBitsetHelperPubSubType::deserialize( MapWStringInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37409,8 +37409,8 @@ void MapWStringInnerBitsetHelperPubSubType::delete_data( } bool MapWStringInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37429,7 +37429,7 @@ bool MapWStringInnerBitsetHelperPubSubType::compute_key( bool MapWStringInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37453,14 +37453,14 @@ bool MapWStringInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -37493,18 +37493,18 @@ MapInnerAliasBoundedStringHelperShortPubSubType::~MapInnerAliasBoundedStringHelp bool MapInnerAliasBoundedStringHelperShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -37523,12 +37523,12 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -37537,14 +37537,14 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::deserialize( MapInnerAliasBoundedStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37589,8 +37589,8 @@ void MapInnerAliasBoundedStringHelperShortPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37609,7 +37609,7 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37633,14 +37633,14 @@ bool MapInnerAliasBoundedStringHelperShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -37673,18 +37673,18 @@ MapInnerAliasBoundedStringHelperUShortPubSubType::~MapInnerAliasBoundedStringHel bool MapInnerAliasBoundedStringHelperUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -37703,12 +37703,12 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -37717,14 +37717,14 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::deserialize( MapInnerAliasBoundedStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37769,8 +37769,8 @@ void MapInnerAliasBoundedStringHelperUShortPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37789,7 +37789,7 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37813,14 +37813,14 @@ bool MapInnerAliasBoundedStringHelperUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -37853,18 +37853,18 @@ MapInnerAliasBoundedStringHelperLongPubSubType::~MapInnerAliasBoundedStringHelpe bool MapInnerAliasBoundedStringHelperLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -37883,12 +37883,12 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -37897,14 +37897,14 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::deserialize( MapInnerAliasBoundedStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -37949,8 +37949,8 @@ void MapInnerAliasBoundedStringHelperLongPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37969,7 +37969,7 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -37993,14 +37993,14 @@ bool MapInnerAliasBoundedStringHelperLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38033,18 +38033,18 @@ MapInnerAliasBoundedStringHelperULongPubSubType::~MapInnerAliasBoundedStringHelp bool MapInnerAliasBoundedStringHelperULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38063,12 +38063,12 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38077,14 +38077,14 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::deserialize( MapInnerAliasBoundedStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -38129,8 +38129,8 @@ void MapInnerAliasBoundedStringHelperULongPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38149,7 +38149,7 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38173,14 +38173,14 @@ bool MapInnerAliasBoundedStringHelperULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38213,18 +38213,18 @@ MapInnerAliasBoundedStringHelperLongLongPubSubType::~MapInnerAliasBoundedStringH bool MapInnerAliasBoundedStringHelperLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38243,12 +38243,12 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38257,14 +38257,14 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::deserialize( MapInnerAliasBoundedStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -38309,8 +38309,8 @@ void MapInnerAliasBoundedStringHelperLongLongPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38329,7 +38329,7 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38353,14 +38353,14 @@ bool MapInnerAliasBoundedStringHelperLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38393,18 +38393,18 @@ MapInnerAliasBoundedStringHelperULongLongPubSubType::~MapInnerAliasBoundedString bool MapInnerAliasBoundedStringHelperULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38423,12 +38423,12 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38437,14 +38437,14 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::deserialize( MapInnerAliasBoundedStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -38489,8 +38489,8 @@ void MapInnerAliasBoundedStringHelperULongLongPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38509,7 +38509,7 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38533,14 +38533,14 @@ bool MapInnerAliasBoundedStringHelperULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38573,18 +38573,18 @@ MapInnerAliasBoundedStringHelperFloatPubSubType::~MapInnerAliasBoundedStringHelp bool MapInnerAliasBoundedStringHelperFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38603,12 +38603,12 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38617,14 +38617,14 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::deserialize( MapInnerAliasBoundedStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -38669,8 +38669,8 @@ void MapInnerAliasBoundedStringHelperFloatPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38689,7 +38689,7 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38713,14 +38713,14 @@ bool MapInnerAliasBoundedStringHelperFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38753,18 +38753,18 @@ MapInnerAliasBoundedStringHelperDoublePubSubType::~MapInnerAliasBoundedStringHel bool MapInnerAliasBoundedStringHelperDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38783,12 +38783,12 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38797,14 +38797,14 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::deserialize( MapInnerAliasBoundedStringHelperDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -38849,8 +38849,8 @@ void MapInnerAliasBoundedStringHelperDoublePubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38869,7 +38869,7 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -38893,14 +38893,14 @@ bool MapInnerAliasBoundedStringHelperDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -38933,18 +38933,18 @@ MapInnerAliasBoundedStringHelperLongDoublePubSubType::~MapInnerAliasBoundedStrin bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -38963,12 +38963,12 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -38977,14 +38977,14 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::deserialize( MapInnerAliasBoundedStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39029,8 +39029,8 @@ void MapInnerAliasBoundedStringHelperLongDoublePubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39049,7 +39049,7 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39073,14 +39073,14 @@ bool MapInnerAliasBoundedStringHelperLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -39113,18 +39113,18 @@ MapInnerAliasBoundedStringHelperBooleanPubSubType::~MapInnerAliasBoundedStringHe bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -39143,12 +39143,12 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -39157,14 +39157,14 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::deserialize( MapInnerAliasBoundedStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39209,8 +39209,8 @@ void MapInnerAliasBoundedStringHelperBooleanPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39229,7 +39229,7 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39253,14 +39253,14 @@ bool MapInnerAliasBoundedStringHelperBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -39293,18 +39293,18 @@ MapInnerAliasBoundedStringHelperOctetPubSubType::~MapInnerAliasBoundedStringHelp bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -39323,12 +39323,12 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -39337,14 +39337,14 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::deserialize( MapInnerAliasBoundedStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39389,8 +39389,8 @@ void MapInnerAliasBoundedStringHelperOctetPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39409,7 +39409,7 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39433,14 +39433,14 @@ bool MapInnerAliasBoundedStringHelperOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -39473,18 +39473,18 @@ MapInnerAliasBoundedStringHelperCharPubSubType::~MapInnerAliasBoundedStringHelpe bool MapInnerAliasBoundedStringHelperCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -39503,12 +39503,12 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -39517,14 +39517,14 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::deserialize( MapInnerAliasBoundedStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39569,8 +39569,8 @@ void MapInnerAliasBoundedStringHelperCharPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39589,7 +39589,7 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39613,14 +39613,14 @@ bool MapInnerAliasBoundedStringHelperCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -39653,18 +39653,18 @@ MapInnerAliasBoundedStringHelperWCharPubSubType::~MapInnerAliasBoundedStringHelp bool MapInnerAliasBoundedStringHelperWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -39683,12 +39683,12 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -39697,14 +39697,14 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::deserialize( MapInnerAliasBoundedStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39749,8 +39749,8 @@ void MapInnerAliasBoundedStringHelperWCharPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39769,7 +39769,7 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39793,14 +39793,14 @@ bool MapInnerAliasBoundedStringHelperWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -39833,18 +39833,18 @@ MapInnerAliasBoundedStringHelperStringPubSubType::~MapInnerAliasBoundedStringHel bool MapInnerAliasBoundedStringHelperStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -39863,12 +39863,12 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -39877,14 +39877,14 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::deserialize( MapInnerAliasBoundedStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -39929,8 +39929,8 @@ void MapInnerAliasBoundedStringHelperStringPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39949,7 +39949,7 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -39973,14 +39973,14 @@ bool MapInnerAliasBoundedStringHelperStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40013,18 +40013,18 @@ MapInnerAliasBoundedStringHelperWStringPubSubType::~MapInnerAliasBoundedStringHe bool MapInnerAliasBoundedStringHelperWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40043,12 +40043,12 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40057,14 +40057,14 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::deserialize( MapInnerAliasBoundedStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -40109,8 +40109,8 @@ void MapInnerAliasBoundedStringHelperWStringPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40129,7 +40129,7 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40153,14 +40153,14 @@ bool MapInnerAliasBoundedStringHelperWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40193,18 +40193,18 @@ MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::~MapInn bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40223,12 +40223,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::se } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40237,14 +40237,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::de MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -40289,8 +40289,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::de } bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40309,7 +40309,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::co bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40333,14 +40333,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType::co md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40373,18 +40373,18 @@ MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::~MapIn bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40403,12 +40403,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::s } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40417,14 +40417,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::d MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -40469,8 +40469,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::d } bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40489,7 +40489,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::c bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40513,14 +40513,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType::c md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40553,18 +40553,18 @@ MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::~MapInnerAliasBounded bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40583,12 +40583,12 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40597,14 +40597,14 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -40649,8 +40649,8 @@ void MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40669,7 +40669,7 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40693,14 +40693,14 @@ bool MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40733,18 +40733,18 @@ MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::~MapInnerAliasBoun bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40763,12 +40763,12 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40777,14 +40777,14 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -40829,8 +40829,8 @@ void MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40849,7 +40849,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -40873,14 +40873,14 @@ bool MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -40913,18 +40913,18 @@ MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::~MapInnerAliasBounde bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -40943,12 +40943,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -40957,14 +40957,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41009,8 +41009,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41029,7 +41029,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41053,14 +41053,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41093,18 +41093,18 @@ MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::~MapInnerAliasB bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -41123,12 +41123,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -41137,14 +41137,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::deserializ MapInnerAliasBoundedStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41189,8 +41189,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::delete_dat } bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41209,7 +41209,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_ke bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41233,14 +41233,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType::compute_ke md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41273,18 +41273,18 @@ MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::~MapInnerAli bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -41303,12 +41303,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::seriali } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -41317,14 +41317,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::deseria MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41369,8 +41369,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::delete_ } bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41389,7 +41389,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41413,14 +41413,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType::compute md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41453,18 +41453,18 @@ MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::~MapInnerAliasBou bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -41483,12 +41483,12 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -41497,14 +41497,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41549,8 +41549,8 @@ void MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41569,7 +41569,7 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41593,14 +41593,14 @@ bool MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41633,18 +41633,18 @@ MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBounde bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -41663,12 +41663,12 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -41677,14 +41677,14 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41729,8 +41729,8 @@ void MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41749,7 +41749,7 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41773,14 +41773,14 @@ bool MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41813,18 +41813,18 @@ MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::~MapInnerAliasBo bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -41843,12 +41843,12 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -41857,14 +41857,14 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::deserialize MapInnerAliasBoundedStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -41909,8 +41909,8 @@ void MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::delete_data } bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41929,7 +41929,7 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -41953,14 +41953,14 @@ bool MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType::compute_key md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -41993,18 +41993,18 @@ MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::~MapInnerAliasBound bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42023,12 +42023,12 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42037,14 +42037,14 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::deserialize( MapInnerAliasBoundedStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42089,8 +42089,8 @@ void MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::delete_data( } bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42109,7 +42109,7 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42133,14 +42133,14 @@ bool MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -42173,18 +42173,18 @@ MapInnerAliasBoundedWStringHelperShortPubSubType::~MapInnerAliasBoundedWStringHe bool MapInnerAliasBoundedWStringHelperShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42203,12 +42203,12 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42217,14 +42217,14 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::deserialize( MapInnerAliasBoundedWStringHelperShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42269,8 +42269,8 @@ void MapInnerAliasBoundedWStringHelperShortPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42289,7 +42289,7 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42313,14 +42313,14 @@ bool MapInnerAliasBoundedWStringHelperShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -42353,18 +42353,18 @@ MapInnerAliasBoundedWStringHelperUShortPubSubType::~MapInnerAliasBoundedWStringH bool MapInnerAliasBoundedWStringHelperUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42383,12 +42383,12 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42397,14 +42397,14 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::deserialize( MapInnerAliasBoundedWStringHelperUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42449,8 +42449,8 @@ void MapInnerAliasBoundedWStringHelperUShortPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42469,7 +42469,7 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42493,14 +42493,14 @@ bool MapInnerAliasBoundedWStringHelperUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -42533,18 +42533,18 @@ MapInnerAliasBoundedWStringHelperLongPubSubType::~MapInnerAliasBoundedWStringHel bool MapInnerAliasBoundedWStringHelperLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42563,12 +42563,12 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42577,14 +42577,14 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::deserialize( MapInnerAliasBoundedWStringHelperLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42629,8 +42629,8 @@ void MapInnerAliasBoundedWStringHelperLongPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42649,7 +42649,7 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42673,14 +42673,14 @@ bool MapInnerAliasBoundedWStringHelperLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -42713,18 +42713,18 @@ MapInnerAliasBoundedWStringHelperULongPubSubType::~MapInnerAliasBoundedWStringHe bool MapInnerAliasBoundedWStringHelperULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42743,12 +42743,12 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42757,14 +42757,14 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::deserialize( MapInnerAliasBoundedWStringHelperULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42809,8 +42809,8 @@ void MapInnerAliasBoundedWStringHelperULongPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42829,7 +42829,7 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -42853,14 +42853,14 @@ bool MapInnerAliasBoundedWStringHelperULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -42893,18 +42893,18 @@ MapInnerAliasBoundedWStringHelperLongLongPubSubType::~MapInnerAliasBoundedWStrin bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -42923,12 +42923,12 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -42937,14 +42937,14 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::deserialize( MapInnerAliasBoundedWStringHelperLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -42989,8 +42989,8 @@ void MapInnerAliasBoundedWStringHelperLongLongPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43009,7 +43009,7 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43033,14 +43033,14 @@ bool MapInnerAliasBoundedWStringHelperLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43073,18 +43073,18 @@ MapInnerAliasBoundedWStringHelperULongLongPubSubType::~MapInnerAliasBoundedWStri bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -43103,12 +43103,12 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -43117,14 +43117,14 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::deserialize( MapInnerAliasBoundedWStringHelperULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -43169,8 +43169,8 @@ void MapInnerAliasBoundedWStringHelperULongLongPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43189,7 +43189,7 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43213,14 +43213,14 @@ bool MapInnerAliasBoundedWStringHelperULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43253,18 +43253,18 @@ MapInnerAliasBoundedWStringHelperFloatPubSubType::~MapInnerAliasBoundedWStringHe bool MapInnerAliasBoundedWStringHelperFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -43283,12 +43283,12 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -43297,14 +43297,14 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::deserialize( MapInnerAliasBoundedWStringHelperFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -43349,8 +43349,8 @@ void MapInnerAliasBoundedWStringHelperFloatPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43369,7 +43369,7 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43393,14 +43393,14 @@ bool MapInnerAliasBoundedWStringHelperFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43433,18 +43433,18 @@ MapInnerAliasBoundedWStringHelperDoublePubSubType::~MapInnerAliasBoundedWStringH bool MapInnerAliasBoundedWStringHelperDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -43463,12 +43463,12 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -43477,14 +43477,14 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::deserialize( MapInnerAliasBoundedWStringHelperDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -43529,8 +43529,8 @@ void MapInnerAliasBoundedWStringHelperDoublePubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43549,7 +43549,7 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43573,14 +43573,14 @@ bool MapInnerAliasBoundedWStringHelperDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43613,18 +43613,18 @@ MapInnerAliasBoundedWStringHelperLongDoublePubSubType::~MapInnerAliasBoundedWStr bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -43643,12 +43643,12 @@ bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -43657,14 +43657,14 @@ bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::deserialize( MapInnerAliasBoundedWStringHelperLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -43709,8 +43709,8 @@ void MapInnerAliasBoundedWStringHelperLongDoublePubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43729,7 +43729,7 @@ bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43753,14 +43753,14 @@ bool MapInnerAliasBoundedWStringHelperLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43793,18 +43793,18 @@ MapInnerAliasBoundedWStringHelperBooleanPubSubType::~MapInnerAliasBoundedWString bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -43823,12 +43823,12 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -43837,14 +43837,14 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::deserialize( MapInnerAliasBoundedWStringHelperBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -43889,8 +43889,8 @@ void MapInnerAliasBoundedWStringHelperBooleanPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43909,7 +43909,7 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -43933,14 +43933,14 @@ bool MapInnerAliasBoundedWStringHelperBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -43973,18 +43973,18 @@ MapInnerAliasBoundedWStringHelperOctetPubSubType::~MapInnerAliasBoundedWStringHe bool MapInnerAliasBoundedWStringHelperOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44003,12 +44003,12 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44017,14 +44017,14 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::deserialize( MapInnerAliasBoundedWStringHelperOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44069,8 +44069,8 @@ void MapInnerAliasBoundedWStringHelperOctetPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44089,7 +44089,7 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44113,14 +44113,14 @@ bool MapInnerAliasBoundedWStringHelperOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -44153,18 +44153,18 @@ MapInnerAliasBoundedWStringHelperCharPubSubType::~MapInnerAliasBoundedWStringHel bool MapInnerAliasBoundedWStringHelperCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44183,12 +44183,12 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44197,14 +44197,14 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::deserialize( MapInnerAliasBoundedWStringHelperChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44249,8 +44249,8 @@ void MapInnerAliasBoundedWStringHelperCharPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44269,7 +44269,7 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44293,14 +44293,14 @@ bool MapInnerAliasBoundedWStringHelperCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -44333,18 +44333,18 @@ MapInnerAliasBoundedWStringHelperWCharPubSubType::~MapInnerAliasBoundedWStringHe bool MapInnerAliasBoundedWStringHelperWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44363,12 +44363,12 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44377,14 +44377,14 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::deserialize( MapInnerAliasBoundedWStringHelperWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44429,8 +44429,8 @@ void MapInnerAliasBoundedWStringHelperWCharPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44449,7 +44449,7 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44473,14 +44473,14 @@ bool MapInnerAliasBoundedWStringHelperWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -44513,18 +44513,18 @@ MapInnerAliasBoundedWStringHelperStringPubSubType::~MapInnerAliasBoundedWStringH bool MapInnerAliasBoundedWStringHelperStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44543,12 +44543,12 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44557,14 +44557,14 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::deserialize( MapInnerAliasBoundedWStringHelperString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44609,8 +44609,8 @@ void MapInnerAliasBoundedWStringHelperStringPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44629,7 +44629,7 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44653,14 +44653,14 @@ bool MapInnerAliasBoundedWStringHelperStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -44693,18 +44693,18 @@ MapInnerAliasBoundedWStringHelperWStringPubSubType::~MapInnerAliasBoundedWString bool MapInnerAliasBoundedWStringHelperWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44723,12 +44723,12 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44737,14 +44737,14 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::deserialize( MapInnerAliasBoundedWStringHelperWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44789,8 +44789,8 @@ void MapInnerAliasBoundedWStringHelperWStringPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44809,7 +44809,7 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44833,14 +44833,14 @@ bool MapInnerAliasBoundedWStringHelperWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -44873,18 +44873,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::~MapIn bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -44903,12 +44903,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::s } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -44917,14 +44917,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::d MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -44969,8 +44969,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::d } bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -44989,7 +44989,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::c bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45013,14 +45013,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType::c md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45053,18 +45053,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::~MapI bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45083,12 +45083,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45097,14 +45097,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -45149,8 +45149,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: } bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45169,7 +45169,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45193,14 +45193,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType:: md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45233,18 +45233,18 @@ MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::~MapInnerAliasBounde bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45263,12 +45263,12 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45277,14 +45277,14 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::deserialize( MapInnerAliasBoundedWStringHelperInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -45329,8 +45329,8 @@ void MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45349,7 +45349,7 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45373,14 +45373,14 @@ bool MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45413,18 +45413,18 @@ MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::~MapInnerAliasBou bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45443,12 +45443,12 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45457,14 +45457,14 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::deserialize( MapInnerAliasBoundedWStringHelperInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -45509,8 +45509,8 @@ void MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45529,7 +45529,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45553,14 +45553,14 @@ bool MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45593,18 +45593,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::~MapInnerAliasBound bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45623,12 +45623,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45637,14 +45637,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::deserialize( MapInnerAliasBoundedWStringHelperInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -45689,8 +45689,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45709,7 +45709,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45733,14 +45733,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45773,18 +45773,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::~MapInnerAlias bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45803,12 +45803,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::serialize } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45817,14 +45817,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::deseriali MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -45869,8 +45869,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::delete_da } bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45889,7 +45889,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_k bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -45913,14 +45913,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType::compute_k md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -45953,18 +45953,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::~MapInnerAl bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -45983,12 +45983,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::serial } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -45997,14 +45997,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::deseri MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46049,8 +46049,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::delete } bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46069,7 +46069,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::comput bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46093,14 +46093,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType::comput md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -46133,18 +46133,18 @@ MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::~MapInnerAliasBo bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -46163,12 +46163,12 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -46177,14 +46177,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::deserialize MapInnerAliasBoundedWStringHelperInnerAliasMapHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46229,8 +46229,8 @@ void MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::delete_data } bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46249,7 +46249,7 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46273,14 +46273,14 @@ bool MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType::compute_key md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -46313,18 +46313,18 @@ MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::~MapInnerAliasBound bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -46343,12 +46343,12 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -46357,14 +46357,14 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::deserialize( MapInnerAliasBoundedWStringHelperInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46409,8 +46409,8 @@ void MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46429,7 +46429,7 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46453,14 +46453,14 @@ bool MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -46493,18 +46493,18 @@ MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::~MapInnerAliasB bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -46523,12 +46523,12 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -46537,14 +46537,14 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::deserializ MapInnerAliasBoundedWStringHelperInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46589,8 +46589,8 @@ void MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::delete_dat } bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46609,7 +46609,7 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_ke bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46633,14 +46633,14 @@ bool MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType::compute_ke md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -46673,18 +46673,18 @@ MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::~MapInnerAliasBoun bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapInnerAliasBoundedWStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -46703,12 +46703,12 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -46717,14 +46717,14 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::deserialize( MapInnerAliasBoundedWStringHelperInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46769,8 +46769,8 @@ void MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::delete_data( } bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46789,7 +46789,7 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46813,14 +46813,14 @@ bool MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -46853,18 +46853,18 @@ BoundedSmallMapPubSubType::~BoundedSmallMapPubSubType() bool BoundedSmallMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedSmallMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -46883,12 +46883,12 @@ bool BoundedSmallMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedSmallMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -46897,14 +46897,14 @@ bool BoundedSmallMapPubSubType::deserialize( BoundedSmallMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -46949,8 +46949,8 @@ void BoundedSmallMapPubSubType::delete_data( } bool BoundedSmallMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46969,7 +46969,7 @@ bool BoundedSmallMapPubSubType::compute_key( bool BoundedSmallMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -46993,14 +46993,14 @@ bool BoundedSmallMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -47033,18 +47033,18 @@ BoundedLargeMapPubSubType::~BoundedLargeMapPubSubType() bool BoundedLargeMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedLargeMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -47063,12 +47063,12 @@ bool BoundedLargeMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedLargeMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -47077,14 +47077,14 @@ bool BoundedLargeMapPubSubType::deserialize( BoundedLargeMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -47129,8 +47129,8 @@ void BoundedLargeMapPubSubType::delete_data( } bool BoundedLargeMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -47149,7 +47149,7 @@ bool BoundedLargeMapPubSubType::compute_key( bool BoundedLargeMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -47173,14 +47173,14 @@ bool BoundedLargeMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index 2f206938378..2a7662cf787 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -55,11 +55,11 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2267,11 +2267,11 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2279,13 +2279,13 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2346,11 +2346,11 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2358,13 +2358,13 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2425,11 +2425,11 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2437,13 +2437,13 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2504,11 +2504,11 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2516,13 +2516,13 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2583,11 +2583,11 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2595,13 +2595,13 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2662,11 +2662,11 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2674,13 +2674,13 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2741,11 +2741,11 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2753,13 +2753,13 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2820,11 +2820,11 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2832,13 +2832,13 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2899,11 +2899,11 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2911,13 +2911,13 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2978,11 +2978,11 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2990,13 +2990,13 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3057,11 +3057,11 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3069,13 +3069,13 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3136,11 +3136,11 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3148,13 +3148,13 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3215,11 +3215,11 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3227,13 +3227,13 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3294,11 +3294,11 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3306,13 +3306,13 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3373,11 +3373,11 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3385,13 +3385,13 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3452,11 +3452,11 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3464,13 +3464,13 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3531,11 +3531,11 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3543,13 +3543,13 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3610,11 +3610,11 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3622,13 +3622,13 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3689,11 +3689,11 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3701,13 +3701,13 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3768,11 +3768,11 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3780,13 +3780,13 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3847,11 +3847,11 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3859,13 +3859,13 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3926,11 +3926,11 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3938,13 +3938,13 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4005,11 +4005,11 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4017,13 +4017,13 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4084,11 +4084,11 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4096,13 +4096,13 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4163,11 +4163,11 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4175,13 +4175,13 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4242,11 +4242,11 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4254,13 +4254,13 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4321,11 +4321,11 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4333,13 +4333,13 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4400,11 +4400,11 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4412,13 +4412,13 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4479,11 +4479,11 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4491,13 +4491,13 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4558,11 +4558,11 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4570,13 +4570,13 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4637,11 +4637,11 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4649,13 +4649,13 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4716,11 +4716,11 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4728,13 +4728,13 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4795,11 +4795,11 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4807,13 +4807,13 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4874,11 +4874,11 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4886,13 +4886,13 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4953,11 +4953,11 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4965,13 +4965,13 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5032,11 +5032,11 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5044,13 +5044,13 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5111,11 +5111,11 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5123,13 +5123,13 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5190,11 +5190,11 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5202,13 +5202,13 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5269,11 +5269,11 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5281,13 +5281,13 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5348,11 +5348,11 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5360,13 +5360,13 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5427,11 +5427,11 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5439,13 +5439,13 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5506,11 +5506,11 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5518,13 +5518,13 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5585,11 +5585,11 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5597,13 +5597,13 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5664,11 +5664,11 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5676,13 +5676,13 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5743,11 +5743,11 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5755,13 +5755,13 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5822,11 +5822,11 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5834,13 +5834,13 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5901,11 +5901,11 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5913,13 +5913,13 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5980,11 +5980,11 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5992,13 +5992,13 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6059,11 +6059,11 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6071,13 +6071,13 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6138,11 +6138,11 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6150,13 +6150,13 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6217,11 +6217,11 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6229,13 +6229,13 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6296,11 +6296,11 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6308,13 +6308,13 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6375,11 +6375,11 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6387,13 +6387,13 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6454,11 +6454,11 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6466,13 +6466,13 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6533,11 +6533,11 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6545,13 +6545,13 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6612,11 +6612,11 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6624,13 +6624,13 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6691,11 +6691,11 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6703,13 +6703,13 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6770,11 +6770,11 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6782,13 +6782,13 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6849,11 +6849,11 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6861,13 +6861,13 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6928,11 +6928,11 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6940,13 +6940,13 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7007,11 +7007,11 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7019,13 +7019,13 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7086,11 +7086,11 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7098,13 +7098,13 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7165,11 +7165,11 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7177,13 +7177,13 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7244,11 +7244,11 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7256,13 +7256,13 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7323,11 +7323,11 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7335,13 +7335,13 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7402,11 +7402,11 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7414,13 +7414,13 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7481,11 +7481,11 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7493,13 +7493,13 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7560,11 +7560,11 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7572,13 +7572,13 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7639,11 +7639,11 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7651,13 +7651,13 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7718,11 +7718,11 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7730,13 +7730,13 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7797,11 +7797,11 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7809,13 +7809,13 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7876,11 +7876,11 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7888,13 +7888,13 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -7955,11 +7955,11 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -7967,13 +7967,13 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8034,11 +8034,11 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8046,13 +8046,13 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8113,11 +8113,11 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8125,13 +8125,13 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8192,11 +8192,11 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8204,13 +8204,13 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8271,11 +8271,11 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8283,13 +8283,13 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8350,11 +8350,11 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8362,13 +8362,13 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8429,11 +8429,11 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8441,13 +8441,13 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8508,11 +8508,11 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8520,13 +8520,13 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8587,11 +8587,11 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8599,13 +8599,13 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8666,11 +8666,11 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8678,13 +8678,13 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8745,11 +8745,11 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8757,13 +8757,13 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8824,11 +8824,11 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8836,13 +8836,13 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8903,11 +8903,11 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8915,13 +8915,13 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -8982,11 +8982,11 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -8994,13 +8994,13 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9061,11 +9061,11 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9073,13 +9073,13 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9140,11 +9140,11 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9152,13 +9152,13 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9219,11 +9219,11 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9231,13 +9231,13 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9298,11 +9298,11 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9310,13 +9310,13 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9377,11 +9377,11 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9389,13 +9389,13 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9456,11 +9456,11 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9468,13 +9468,13 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9535,11 +9535,11 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9547,13 +9547,13 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9614,11 +9614,11 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9626,13 +9626,13 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9693,11 +9693,11 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9705,13 +9705,13 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9772,11 +9772,11 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9784,13 +9784,13 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9851,11 +9851,11 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9863,13 +9863,13 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -9930,11 +9930,11 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -9942,13 +9942,13 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10009,11 +10009,11 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10021,13 +10021,13 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10088,11 +10088,11 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10100,13 +10100,13 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10167,11 +10167,11 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10179,13 +10179,13 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10246,11 +10246,11 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10258,13 +10258,13 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10325,11 +10325,11 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10337,13 +10337,13 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10404,11 +10404,11 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10416,13 +10416,13 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10483,11 +10483,11 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10495,13 +10495,13 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10562,11 +10562,11 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10574,13 +10574,13 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10641,11 +10641,11 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10653,13 +10653,13 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10720,11 +10720,11 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10732,13 +10732,13 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10799,11 +10799,11 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10811,13 +10811,13 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10878,11 +10878,11 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10890,13 +10890,13 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -10957,11 +10957,11 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -10969,13 +10969,13 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11036,11 +11036,11 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11048,13 +11048,13 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11115,11 +11115,11 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11127,13 +11127,13 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11194,11 +11194,11 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11206,13 +11206,13 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11273,11 +11273,11 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11285,13 +11285,13 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11352,11 +11352,11 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11364,13 +11364,13 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11431,11 +11431,11 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11443,13 +11443,13 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11510,11 +11510,11 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11522,13 +11522,13 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11589,11 +11589,11 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11601,13 +11601,13 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11668,11 +11668,11 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11680,13 +11680,13 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11747,11 +11747,11 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11759,13 +11759,13 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11826,11 +11826,11 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11838,13 +11838,13 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11905,11 +11905,11 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11917,13 +11917,13 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -11984,11 +11984,11 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -11996,13 +11996,13 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12063,11 +12063,11 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12075,13 +12075,13 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12142,11 +12142,11 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12154,13 +12154,13 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12221,11 +12221,11 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12233,13 +12233,13 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12300,11 +12300,11 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12312,13 +12312,13 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12379,11 +12379,11 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12391,13 +12391,13 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12458,11 +12458,11 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12470,13 +12470,13 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12537,11 +12537,11 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12549,13 +12549,13 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12616,11 +12616,11 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12628,13 +12628,13 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12695,11 +12695,11 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12707,13 +12707,13 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12774,11 +12774,11 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12786,13 +12786,13 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12853,11 +12853,11 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12865,13 +12865,13 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -12932,11 +12932,11 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -12944,13 +12944,13 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13011,11 +13011,11 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13023,13 +13023,13 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13090,11 +13090,11 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13102,13 +13102,13 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13169,11 +13169,11 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13181,13 +13181,13 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13248,11 +13248,11 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13260,13 +13260,13 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13327,11 +13327,11 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13339,13 +13339,13 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13406,11 +13406,11 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13418,13 +13418,13 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13485,11 +13485,11 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13497,13 +13497,13 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13564,11 +13564,11 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13576,13 +13576,13 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13643,11 +13643,11 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13655,13 +13655,13 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13722,11 +13722,11 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13734,13 +13734,13 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13801,11 +13801,11 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13813,13 +13813,13 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13880,11 +13880,11 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13892,13 +13892,13 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -13959,11 +13959,11 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -13971,13 +13971,13 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14038,11 +14038,11 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14050,13 +14050,13 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14117,11 +14117,11 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14129,13 +14129,13 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14196,11 +14196,11 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14208,13 +14208,13 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14275,11 +14275,11 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14287,13 +14287,13 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14354,11 +14354,11 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14366,13 +14366,13 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14433,11 +14433,11 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14445,13 +14445,13 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14512,11 +14512,11 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14524,13 +14524,13 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14591,11 +14591,11 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14603,13 +14603,13 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14670,11 +14670,11 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14682,13 +14682,13 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14749,11 +14749,11 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14761,13 +14761,13 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14828,11 +14828,11 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14840,13 +14840,13 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14907,11 +14907,11 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14919,13 +14919,13 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -14986,11 +14986,11 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -14998,13 +14998,13 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15065,11 +15065,11 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15077,13 +15077,13 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15144,11 +15144,11 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15156,13 +15156,13 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15223,11 +15223,11 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15235,13 +15235,13 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15302,11 +15302,11 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15314,13 +15314,13 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15381,11 +15381,11 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15393,13 +15393,13 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15460,11 +15460,11 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15472,13 +15472,13 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15539,11 +15539,11 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15551,13 +15551,13 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15618,11 +15618,11 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15630,13 +15630,13 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15697,11 +15697,11 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15709,13 +15709,13 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15776,11 +15776,11 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15788,13 +15788,13 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15855,11 +15855,11 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15867,13 +15867,13 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -15934,11 +15934,11 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -15946,13 +15946,13 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16013,11 +16013,11 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16025,13 +16025,13 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16092,11 +16092,11 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16104,13 +16104,13 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16171,11 +16171,11 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16183,13 +16183,13 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16250,11 +16250,11 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16262,13 +16262,13 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16329,11 +16329,11 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16341,13 +16341,13 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16408,11 +16408,11 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16420,13 +16420,13 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16487,11 +16487,11 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16499,13 +16499,13 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16566,11 +16566,11 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16578,13 +16578,13 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16645,11 +16645,11 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16657,13 +16657,13 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16724,11 +16724,11 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16736,13 +16736,13 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16803,11 +16803,11 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16815,13 +16815,13 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16882,11 +16882,11 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16894,13 +16894,13 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -16961,11 +16961,11 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -16973,13 +16973,13 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17040,11 +17040,11 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17052,13 +17052,13 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17119,11 +17119,11 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17131,13 +17131,13 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17198,11 +17198,11 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17210,13 +17210,13 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17277,11 +17277,11 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17289,13 +17289,13 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17356,11 +17356,11 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17368,13 +17368,13 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17435,11 +17435,11 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17447,13 +17447,13 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17514,11 +17514,11 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17526,13 +17526,13 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17593,11 +17593,11 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17605,13 +17605,13 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17672,11 +17672,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17684,13 +17684,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17751,11 +17751,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17763,13 +17763,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17830,11 +17830,11 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17842,13 +17842,13 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17909,11 +17909,11 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -17921,13 +17921,13 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -17988,11 +17988,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18000,13 +18000,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18067,11 +18067,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18079,13 +18079,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18146,11 +18146,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18158,13 +18158,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18225,11 +18225,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18237,13 +18237,13 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18304,11 +18304,11 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18316,13 +18316,13 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18383,11 +18383,11 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18395,13 +18395,13 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18462,11 +18462,11 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18474,13 +18474,13 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18541,11 +18541,11 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18553,13 +18553,13 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18620,11 +18620,11 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18632,13 +18632,13 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18699,11 +18699,11 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18711,13 +18711,13 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18778,11 +18778,11 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18790,13 +18790,13 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18857,11 +18857,11 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18869,13 +18869,13 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -18936,11 +18936,11 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -18948,13 +18948,13 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19015,11 +19015,11 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19027,13 +19027,13 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19094,11 +19094,11 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19106,13 +19106,13 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19173,11 +19173,11 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19185,13 +19185,13 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19252,11 +19252,11 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19264,13 +19264,13 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19331,11 +19331,11 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19343,13 +19343,13 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19410,11 +19410,11 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19422,13 +19422,13 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19489,11 +19489,11 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19501,13 +19501,13 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19568,11 +19568,11 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19580,13 +19580,13 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19647,11 +19647,11 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19659,13 +19659,13 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19726,11 +19726,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19738,13 +19738,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19805,11 +19805,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19817,13 +19817,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19884,11 +19884,11 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19896,13 +19896,13 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -19963,11 +19963,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -19975,13 +19975,13 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20042,11 +20042,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20054,13 +20054,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20121,11 +20121,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20133,13 +20133,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20200,11 +20200,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20212,13 +20212,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20279,11 +20279,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20291,13 +20291,13 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20358,11 +20358,11 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20370,13 +20370,13 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20437,11 +20437,11 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20449,13 +20449,13 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20516,11 +20516,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20528,13 +20528,13 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20595,11 +20595,11 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20607,13 +20607,13 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -20674,11 +20674,11 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -20686,13 +20686,13 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/member_idPubSubTypes.cxx b/test/dds-types-test/member_idPubSubTypes.cxx index 9e6db334afb..805d3efb280 100644 --- a/test/dds-types-test/member_idPubSubTypes.cxx +++ b/test/dds-types-test/member_idPubSubTypes.cxx @@ -53,18 +53,18 @@ FixIdPubSubType::~FixIdPubSubType() bool FixIdPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -83,12 +83,12 @@ bool FixIdPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixIdPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool FixIdPubSubType::deserialize( FixId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void FixIdPubSubType::delete_data( } bool FixIdPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool FixIdPubSubType::compute_key( bool FixIdPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool FixIdPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ FixHexIdPubSubType::~FixHexIdPubSubType() bool FixHexIdPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixHexId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -263,12 +263,12 @@ bool FixHexIdPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixHexIdPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool FixHexIdPubSubType::deserialize( FixHexId* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void FixHexIdPubSubType::delete_data( } bool FixHexIdPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool FixHexIdPubSubType::compute_key( bool FixHexIdPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool FixHexIdPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ FixHashidDefaultPubSubType::~FixHashidDefaultPubSubType() bool FixHashidDefaultPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixHashidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -443,12 +443,12 @@ bool FixHashidDefaultPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixHashidDefaultPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool FixHashidDefaultPubSubType::deserialize( FixHashidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void FixHashidDefaultPubSubType::delete_data( } bool FixHashidDefaultPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool FixHashidDefaultPubSubType::compute_key( bool FixHashidDefaultPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool FixHashidDefaultPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ FixHashidPubSubType::~FixHashidPubSubType() bool FixHashidPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixHashid* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -623,12 +623,12 @@ bool FixHashidPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixHashidPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool FixHashidPubSubType::deserialize( FixHashid* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void FixHashidPubSubType::delete_data( } bool FixHashidPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool FixHashidPubSubType::compute_key( bool FixHashidPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool FixHashidPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ FixMixPubSubType::~FixMixPubSubType() bool FixMixPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FixMix* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -803,12 +803,12 @@ bool FixMixPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FixMixPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool FixMixPubSubType::deserialize( FixMix* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void FixMixPubSubType::delete_data( } bool FixMixPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool FixMixPubSubType::compute_key( bool FixMixPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool FixMixPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ AutoidDefaultPubSubType::~AutoidDefaultPubSubType() bool AutoidDefaultPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -983,12 +983,12 @@ bool AutoidDefaultPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AutoidDefaultPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool AutoidDefaultPubSubType::deserialize( AutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void AutoidDefaultPubSubType::delete_data( } bool AutoidDefaultPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool AutoidDefaultPubSubType::compute_key( bool AutoidDefaultPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool AutoidDefaultPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ AutoidSequentialPubSubType::~AutoidSequentialPubSubType() bool AutoidSequentialPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1163,12 +1163,12 @@ bool AutoidSequentialPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AutoidSequentialPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool AutoidSequentialPubSubType::deserialize( AutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void AutoidSequentialPubSubType::delete_data( } bool AutoidSequentialPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool AutoidSequentialPubSubType::compute_key( bool AutoidSequentialPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool AutoidSequentialPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ AutoidHashPubSubType::~AutoidHashPubSubType() bool AutoidHashPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1343,12 +1343,12 @@ bool AutoidHashPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AutoidHashPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool AutoidHashPubSubType::deserialize( AutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void AutoidHashPubSubType::delete_data( } bool AutoidHashPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool AutoidHashPubSubType::compute_key( bool AutoidHashPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool AutoidHashPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ DerivedAutoidDefaultPubSubType::~DerivedAutoidDefaultPubSubType() bool DerivedAutoidDefaultPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DerivedAutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1523,12 +1523,12 @@ bool DerivedAutoidDefaultPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DerivedAutoidDefaultPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool DerivedAutoidDefaultPubSubType::deserialize( DerivedAutoidDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void DerivedAutoidDefaultPubSubType::delete_data( } bool DerivedAutoidDefaultPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool DerivedAutoidDefaultPubSubType::compute_key( bool DerivedAutoidDefaultPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool DerivedAutoidDefaultPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ DerivedEmptyAutoidSequentialPubSubType::~DerivedEmptyAutoidSequentialPubSubType( bool DerivedEmptyAutoidSequentialPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DerivedEmptyAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1703,12 +1703,12 @@ bool DerivedEmptyAutoidSequentialPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DerivedEmptyAutoidSequentialPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool DerivedEmptyAutoidSequentialPubSubType::deserialize( DerivedEmptyAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void DerivedEmptyAutoidSequentialPubSubType::delete_data( } bool DerivedEmptyAutoidSequentialPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool DerivedEmptyAutoidSequentialPubSubType::compute_key( bool DerivedEmptyAutoidSequentialPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool DerivedEmptyAutoidSequentialPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ DerivedAutoidSequentialPubSubType::~DerivedAutoidSequentialPubSubType() bool DerivedAutoidSequentialPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DerivedAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1883,12 +1883,12 @@ bool DerivedAutoidSequentialPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DerivedAutoidSequentialPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool DerivedAutoidSequentialPubSubType::deserialize( DerivedAutoidSequential* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void DerivedAutoidSequentialPubSubType::delete_data( } bool DerivedAutoidSequentialPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool DerivedAutoidSequentialPubSubType::compute_key( bool DerivedAutoidSequentialPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool DerivedAutoidSequentialPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ DerivedAutoidHashPubSubType::~DerivedAutoidHashPubSubType() bool DerivedAutoidHashPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DerivedAutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2063,12 +2063,12 @@ bool DerivedAutoidHashPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DerivedAutoidHashPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool DerivedAutoidHashPubSubType::deserialize( DerivedAutoidHash* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void DerivedAutoidHashPubSubType::delete_data( } bool DerivedAutoidHashPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool DerivedAutoidHashPubSubType::compute_key( bool DerivedAutoidHashPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool DerivedAutoidHashPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index dc997303c24..f1bdd74ee18 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -54,11 +54,11 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -291,11 +291,11 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -303,13 +303,13 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -370,11 +370,11 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -382,13 +382,13 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -449,11 +449,11 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -461,13 +461,13 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -528,11 +528,11 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -540,13 +540,13 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -607,11 +607,11 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -619,13 +619,13 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -686,11 +686,11 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -698,13 +698,13 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -765,11 +765,11 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -777,13 +777,13 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -844,11 +844,11 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -856,13 +856,13 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -923,11 +923,11 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -935,13 +935,13 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/mutablePubSubTypes.cxx b/test/dds-types-test/mutablePubSubTypes.cxx index f1173f5481f..cd6da357e11 100644 --- a/test/dds-types-test/mutablePubSubTypes.cxx +++ b/test/dds-types-test/mutablePubSubTypes.cxx @@ -53,18 +53,18 @@ MutableShortStructPubSubType::~MutableShortStructPubSubType() bool MutableShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -83,12 +83,12 @@ bool MutableShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool MutableShortStructPubSubType::deserialize( MutableShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void MutableShortStructPubSubType::delete_data( } bool MutableShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool MutableShortStructPubSubType::compute_key( bool MutableShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool MutableShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ MutableUShortStructPubSubType::~MutableUShortStructPubSubType() bool MutableUShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -263,12 +263,12 @@ bool MutableUShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableUShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool MutableUShortStructPubSubType::deserialize( MutableUShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void MutableUShortStructPubSubType::delete_data( } bool MutableUShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool MutableUShortStructPubSubType::compute_key( bool MutableUShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool MutableUShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ MutableLongStructPubSubType::~MutableLongStructPubSubType() bool MutableLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -443,12 +443,12 @@ bool MutableLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool MutableLongStructPubSubType::deserialize( MutableLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void MutableLongStructPubSubType::delete_data( } bool MutableLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool MutableLongStructPubSubType::compute_key( bool MutableLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool MutableLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ MutableULongStructPubSubType::~MutableULongStructPubSubType() bool MutableULongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -623,12 +623,12 @@ bool MutableULongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableULongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool MutableULongStructPubSubType::deserialize( MutableULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void MutableULongStructPubSubType::delete_data( } bool MutableULongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool MutableULongStructPubSubType::compute_key( bool MutableULongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool MutableULongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ MutableLongLongStructPubSubType::~MutableLongLongStructPubSubType() bool MutableLongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -803,12 +803,12 @@ bool MutableLongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableLongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool MutableLongLongStructPubSubType::deserialize( MutableLongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void MutableLongLongStructPubSubType::delete_data( } bool MutableLongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool MutableLongLongStructPubSubType::compute_key( bool MutableLongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool MutableLongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ MutableULongLongStructPubSubType::~MutableULongLongStructPubSubType() bool MutableULongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -983,12 +983,12 @@ bool MutableULongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableULongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool MutableULongLongStructPubSubType::deserialize( MutableULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void MutableULongLongStructPubSubType::delete_data( } bool MutableULongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool MutableULongLongStructPubSubType::compute_key( bool MutableULongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool MutableULongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ MutableFloatStructPubSubType::~MutableFloatStructPubSubType() bool MutableFloatStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1163,12 +1163,12 @@ bool MutableFloatStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableFloatStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool MutableFloatStructPubSubType::deserialize( MutableFloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void MutableFloatStructPubSubType::delete_data( } bool MutableFloatStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool MutableFloatStructPubSubType::compute_key( bool MutableFloatStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool MutableFloatStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ MutableDoubleStructPubSubType::~MutableDoubleStructPubSubType() bool MutableDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1343,12 +1343,12 @@ bool MutableDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool MutableDoubleStructPubSubType::deserialize( MutableDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void MutableDoubleStructPubSubType::delete_data( } bool MutableDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool MutableDoubleStructPubSubType::compute_key( bool MutableDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool MutableDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ MutableLongDoubleStructPubSubType::~MutableLongDoubleStructPubSubType() bool MutableLongDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1523,12 +1523,12 @@ bool MutableLongDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableLongDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool MutableLongDoubleStructPubSubType::deserialize( MutableLongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void MutableLongDoubleStructPubSubType::delete_data( } bool MutableLongDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool MutableLongDoubleStructPubSubType::compute_key( bool MutableLongDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool MutableLongDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ MutableBooleanStructPubSubType::~MutableBooleanStructPubSubType() bool MutableBooleanStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1703,12 +1703,12 @@ bool MutableBooleanStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableBooleanStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool MutableBooleanStructPubSubType::deserialize( MutableBooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void MutableBooleanStructPubSubType::delete_data( } bool MutableBooleanStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool MutableBooleanStructPubSubType::compute_key( bool MutableBooleanStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool MutableBooleanStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ MutableOctetStructPubSubType::~MutableOctetStructPubSubType() bool MutableOctetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -1883,12 +1883,12 @@ bool MutableOctetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableOctetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool MutableOctetStructPubSubType::deserialize( MutableOctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void MutableOctetStructPubSubType::delete_data( } bool MutableOctetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool MutableOctetStructPubSubType::compute_key( bool MutableOctetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool MutableOctetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ MutableCharStructPubSubType::~MutableCharStructPubSubType() bool MutableCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2063,12 +2063,12 @@ bool MutableCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool MutableCharStructPubSubType::deserialize( MutableCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void MutableCharStructPubSubType::delete_data( } bool MutableCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool MutableCharStructPubSubType::compute_key( bool MutableCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool MutableCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ MutableWCharStructPubSubType::~MutableWCharStructPubSubType() bool MutableWCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2243,12 +2243,12 @@ bool MutableWCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableWCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool MutableWCharStructPubSubType::deserialize( MutableWCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void MutableWCharStructPubSubType::delete_data( } bool MutableWCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool MutableWCharStructPubSubType::compute_key( bool MutableWCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool MutableWCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ MutableUnionStructPubSubType::~MutableUnionStructPubSubType() bool MutableUnionStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2423,12 +2423,12 @@ bool MutableUnionStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableUnionStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool MutableUnionStructPubSubType::deserialize( MutableUnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void MutableUnionStructPubSubType::delete_data( } bool MutableUnionStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool MutableUnionStructPubSubType::compute_key( bool MutableUnionStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool MutableUnionStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ MutableEmptyStructPubSubType::~MutableEmptyStructPubSubType() bool MutableEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2603,12 +2603,12 @@ bool MutableEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool MutableEmptyStructPubSubType::deserialize( MutableEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void MutableEmptyStructPubSubType::delete_data( } bool MutableEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool MutableEmptyStructPubSubType::compute_key( bool MutableEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool MutableEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ MutableEmptyInheritanceStructPubSubType::~MutableEmptyInheritanceStructPubSubTyp bool MutableEmptyInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2783,12 +2783,12 @@ bool MutableEmptyInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableEmptyInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool MutableEmptyInheritanceStructPubSubType::deserialize( MutableEmptyInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void MutableEmptyInheritanceStructPubSubType::delete_data( } bool MutableEmptyInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool MutableEmptyInheritanceStructPubSubType::compute_key( bool MutableEmptyInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool MutableEmptyInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ MutableInheritanceStructPubSubType::~MutableInheritanceStructPubSubType() bool MutableInheritanceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -2963,12 +2963,12 @@ bool MutableInheritanceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableInheritanceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool MutableInheritanceStructPubSubType::deserialize( MutableInheritanceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void MutableInheritanceStructPubSubType::delete_data( } bool MutableInheritanceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool MutableInheritanceStructPubSubType::compute_key( bool MutableInheritanceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool MutableInheritanceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ MutableInheritanceEmptyStructPubSubType::~MutableInheritanceEmptyStructPubSubTyp bool MutableInheritanceEmptyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -3143,12 +3143,12 @@ bool MutableInheritanceEmptyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableInheritanceEmptyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool MutableInheritanceEmptyStructPubSubType::deserialize( MutableInheritanceEmptyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void MutableInheritanceEmptyStructPubSubType::delete_data( } bool MutableInheritanceEmptyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool MutableInheritanceEmptyStructPubSubType::compute_key( bool MutableInheritanceEmptyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool MutableInheritanceEmptyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ MutableExtensibilityInheritancePubSubType::~MutableExtensibilityInheritancePubSu bool MutableExtensibilityInheritancePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -3323,12 +3323,12 @@ bool MutableExtensibilityInheritancePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableExtensibilityInheritancePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool MutableExtensibilityInheritancePubSubType::deserialize( MutableExtensibilityInheritance* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void MutableExtensibilityInheritancePubSubType::delete_data( } bool MutableExtensibilityInheritancePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool MutableExtensibilityInheritancePubSubType::compute_key( bool MutableExtensibilityInheritancePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool MutableExtensibilityInheritancePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index 326cfb8a78e..0210aeb75e4 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -55,11 +55,11 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/optionalPubSubTypes.cxx b/test/dds-types-test/optionalPubSubTypes.cxx index 0483c94da72..e954202f319 100644 --- a/test/dds-types-test/optionalPubSubTypes.cxx +++ b/test/dds-types-test/optionalPubSubTypes.cxx @@ -53,18 +53,18 @@ short_optionalPubSubType::~short_optionalPubSubType() bool short_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool short_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool short_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool short_optionalPubSubType::deserialize( short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void short_optionalPubSubType::delete_data( } bool short_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool short_optionalPubSubType::compute_key( bool short_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool short_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ushort_optionalPubSubType::~ushort_optionalPubSubType() bool ushort_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ushort_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ushort_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ushort_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ushort_optionalPubSubType::deserialize( ushort_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ushort_optionalPubSubType::delete_data( } bool ushort_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ushort_optionalPubSubType::compute_key( bool ushort_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ushort_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ long_optionalPubSubType::~long_optionalPubSubType() bool long_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const long_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool long_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool long_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool long_optionalPubSubType::deserialize( long_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void long_optionalPubSubType::delete_data( } bool long_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool long_optionalPubSubType::compute_key( bool long_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool long_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ ulong_optionalPubSubType::~ulong_optionalPubSubType() bool ulong_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool ulong_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulong_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool ulong_optionalPubSubType::deserialize( ulong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void ulong_optionalPubSubType::delete_data( } bool ulong_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool ulong_optionalPubSubType::compute_key( bool ulong_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool ulong_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ longlong_optionalPubSubType::~longlong_optionalPubSubType() bool longlong_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longlong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool longlong_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longlong_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool longlong_optionalPubSubType::deserialize( longlong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void longlong_optionalPubSubType::delete_data( } bool longlong_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool longlong_optionalPubSubType::compute_key( bool longlong_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool longlong_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ ulonglong_optionalPubSubType::~ulonglong_optionalPubSubType() bool ulonglong_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulonglong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool ulonglong_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulonglong_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool ulonglong_optionalPubSubType::deserialize( ulonglong_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void ulonglong_optionalPubSubType::delete_data( } bool ulonglong_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool ulonglong_optionalPubSubType::compute_key( bool ulonglong_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool ulonglong_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ float_optionalPubSubType::~float_optionalPubSubType() bool float_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const float_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool float_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool float_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool float_optionalPubSubType::deserialize( float_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void float_optionalPubSubType::delete_data( } bool float_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool float_optionalPubSubType::compute_key( bool float_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool float_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ double_optionalPubSubType::~double_optionalPubSubType() bool double_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const double_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool double_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool double_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool double_optionalPubSubType::deserialize( double_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void double_optionalPubSubType::delete_data( } bool double_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool double_optionalPubSubType::compute_key( bool double_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool double_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ longdouble_optionalPubSubType::~longdouble_optionalPubSubType() bool longdouble_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longdouble_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool longdouble_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longdouble_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool longdouble_optionalPubSubType::deserialize( longdouble_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void longdouble_optionalPubSubType::delete_data( } bool longdouble_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool longdouble_optionalPubSubType::compute_key( bool longdouble_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool longdouble_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ boolean_optionalPubSubType::~boolean_optionalPubSubType() bool boolean_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const boolean_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool boolean_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool boolean_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool boolean_optionalPubSubType::deserialize( boolean_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void boolean_optionalPubSubType::delete_data( } bool boolean_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool boolean_optionalPubSubType::compute_key( bool boolean_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool boolean_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ octet_optionalPubSubType::~octet_optionalPubSubType() bool octet_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const octet_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool octet_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool octet_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool octet_optionalPubSubType::deserialize( octet_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void octet_optionalPubSubType::delete_data( } bool octet_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool octet_optionalPubSubType::compute_key( bool octet_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool octet_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ char_optionalPubSubType::~char_optionalPubSubType() bool char_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const char_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool char_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool char_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool char_optionalPubSubType::deserialize( char_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void char_optionalPubSubType::delete_data( } bool char_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool char_optionalPubSubType::compute_key( bool char_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool char_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ wchar_optionalPubSubType::~wchar_optionalPubSubType() bool wchar_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const wchar_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool wchar_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool wchar_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool wchar_optionalPubSubType::deserialize( wchar_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void wchar_optionalPubSubType::delete_data( } bool wchar_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool wchar_optionalPubSubType::compute_key( bool wchar_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool wchar_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ short_align_1_optionalPubSubType::~short_align_1_optionalPubSubType() bool short_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool short_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool short_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool short_align_1_optionalPubSubType::deserialize( short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void short_align_1_optionalPubSubType::delete_data( } bool short_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool short_align_1_optionalPubSubType::compute_key( bool short_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool short_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ short_align_2_optionalPubSubType::~short_align_2_optionalPubSubType() bool short_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool short_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool short_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool short_align_2_optionalPubSubType::deserialize( short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void short_align_2_optionalPubSubType::delete_data( } bool short_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool short_align_2_optionalPubSubType::compute_key( bool short_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool short_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ short_align_4_optionalPubSubType::~short_align_4_optionalPubSubType() bool short_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool short_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool short_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool short_align_4_optionalPubSubType::deserialize( short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void short_align_4_optionalPubSubType::delete_data( } bool short_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool short_align_4_optionalPubSubType::compute_key( bool short_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool short_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ ushort_align_1_optionalPubSubType::~ushort_align_1_optionalPubSubType() bool ushort_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ushort_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool ushort_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ushort_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool ushort_align_1_optionalPubSubType::deserialize( ushort_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void ushort_align_1_optionalPubSubType::delete_data( } bool ushort_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool ushort_align_1_optionalPubSubType::compute_key( bool ushort_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool ushort_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ ushort_align_2_optionalPubSubType::~ushort_align_2_optionalPubSubType() bool ushort_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ushort_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool ushort_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ushort_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool ushort_align_2_optionalPubSubType::deserialize( ushort_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void ushort_align_2_optionalPubSubType::delete_data( } bool ushort_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool ushort_align_2_optionalPubSubType::compute_key( bool ushort_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool ushort_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ ushort_align_4_optionalPubSubType::~ushort_align_4_optionalPubSubType() bool ushort_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ushort_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool ushort_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ushort_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool ushort_align_4_optionalPubSubType::deserialize( ushort_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void ushort_align_4_optionalPubSubType::delete_data( } bool ushort_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool ushort_align_4_optionalPubSubType::compute_key( bool ushort_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool ushort_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ long_align_1_optionalPubSubType::~long_align_1_optionalPubSubType() bool long_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const long_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool long_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool long_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool long_align_1_optionalPubSubType::deserialize( long_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void long_align_1_optionalPubSubType::delete_data( } bool long_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool long_align_1_optionalPubSubType::compute_key( bool long_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool long_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ long_align_2_optionalPubSubType::~long_align_2_optionalPubSubType() bool long_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const long_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool long_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool long_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool long_align_2_optionalPubSubType::deserialize( long_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void long_align_2_optionalPubSubType::delete_data( } bool long_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool long_align_2_optionalPubSubType::compute_key( bool long_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool long_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ long_align_4_optionalPubSubType::~long_align_4_optionalPubSubType() bool long_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const long_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool long_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool long_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool long_align_4_optionalPubSubType::deserialize( long_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void long_align_4_optionalPubSubType::delete_data( } bool long_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool long_align_4_optionalPubSubType::compute_key( bool long_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool long_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ ulong_align_1_optionalPubSubType::~ulong_align_1_optionalPubSubType() bool ulong_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool ulong_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulong_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool ulong_align_1_optionalPubSubType::deserialize( ulong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void ulong_align_1_optionalPubSubType::delete_data( } bool ulong_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool ulong_align_1_optionalPubSubType::compute_key( bool ulong_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool ulong_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ ulong_align_2_optionalPubSubType::~ulong_align_2_optionalPubSubType() bool ulong_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool ulong_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulong_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool ulong_align_2_optionalPubSubType::deserialize( ulong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void ulong_align_2_optionalPubSubType::delete_data( } bool ulong_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool ulong_align_2_optionalPubSubType::compute_key( bool ulong_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool ulong_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ ulong_align_4_optionalPubSubType::~ulong_align_4_optionalPubSubType() bool ulong_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool ulong_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulong_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool ulong_align_4_optionalPubSubType::deserialize( ulong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void ulong_align_4_optionalPubSubType::delete_data( } bool ulong_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool ulong_align_4_optionalPubSubType::compute_key( bool ulong_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool ulong_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ longlong_align_1_optionalPubSubType::~longlong_align_1_optionalPubSubType() bool longlong_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longlong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool longlong_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longlong_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool longlong_align_1_optionalPubSubType::deserialize( longlong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void longlong_align_1_optionalPubSubType::delete_data( } bool longlong_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool longlong_align_1_optionalPubSubType::compute_key( bool longlong_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool longlong_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ longlong_align_2_optionalPubSubType::~longlong_align_2_optionalPubSubType() bool longlong_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longlong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool longlong_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longlong_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool longlong_align_2_optionalPubSubType::deserialize( longlong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void longlong_align_2_optionalPubSubType::delete_data( } bool longlong_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool longlong_align_2_optionalPubSubType::compute_key( bool longlong_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool longlong_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ longlong_align_4_optionalPubSubType::~longlong_align_4_optionalPubSubType() bool longlong_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longlong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool longlong_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longlong_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool longlong_align_4_optionalPubSubType::deserialize( longlong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void longlong_align_4_optionalPubSubType::delete_data( } bool longlong_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool longlong_align_4_optionalPubSubType::compute_key( bool longlong_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool longlong_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5093,18 +5093,18 @@ ulonglong_align_1_optionalPubSubType::~ulonglong_align_1_optionalPubSubType() bool ulonglong_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulonglong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5123,12 +5123,12 @@ bool ulonglong_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulonglong_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5137,14 +5137,14 @@ bool ulonglong_align_1_optionalPubSubType::deserialize( ulonglong_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5189,8 +5189,8 @@ void ulonglong_align_1_optionalPubSubType::delete_data( } bool ulonglong_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5209,7 +5209,7 @@ bool ulonglong_align_1_optionalPubSubType::compute_key( bool ulonglong_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5233,14 +5233,14 @@ bool ulonglong_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5273,18 +5273,18 @@ ulonglong_align_2_optionalPubSubType::~ulonglong_align_2_optionalPubSubType() bool ulonglong_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulonglong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5303,12 +5303,12 @@ bool ulonglong_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulonglong_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5317,14 +5317,14 @@ bool ulonglong_align_2_optionalPubSubType::deserialize( ulonglong_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5369,8 +5369,8 @@ void ulonglong_align_2_optionalPubSubType::delete_data( } bool ulonglong_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5389,7 +5389,7 @@ bool ulonglong_align_2_optionalPubSubType::compute_key( bool ulonglong_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5413,14 +5413,14 @@ bool ulonglong_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5453,18 +5453,18 @@ ulonglong_align_4_optionalPubSubType::~ulonglong_align_4_optionalPubSubType() bool ulonglong_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ulonglong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5483,12 +5483,12 @@ bool ulonglong_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ulonglong_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5497,14 +5497,14 @@ bool ulonglong_align_4_optionalPubSubType::deserialize( ulonglong_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5549,8 +5549,8 @@ void ulonglong_align_4_optionalPubSubType::delete_data( } bool ulonglong_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5569,7 +5569,7 @@ bool ulonglong_align_4_optionalPubSubType::compute_key( bool ulonglong_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5593,14 +5593,14 @@ bool ulonglong_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5633,18 +5633,18 @@ float_align_1_optionalPubSubType::~float_align_1_optionalPubSubType() bool float_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const float_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5663,12 +5663,12 @@ bool float_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool float_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5677,14 +5677,14 @@ bool float_align_1_optionalPubSubType::deserialize( float_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5729,8 +5729,8 @@ void float_align_1_optionalPubSubType::delete_data( } bool float_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5749,7 +5749,7 @@ bool float_align_1_optionalPubSubType::compute_key( bool float_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5773,14 +5773,14 @@ bool float_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5813,18 +5813,18 @@ float_align_2_optionalPubSubType::~float_align_2_optionalPubSubType() bool float_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const float_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5843,12 +5843,12 @@ bool float_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool float_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5857,14 +5857,14 @@ bool float_align_2_optionalPubSubType::deserialize( float_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5909,8 +5909,8 @@ void float_align_2_optionalPubSubType::delete_data( } bool float_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5929,7 +5929,7 @@ bool float_align_2_optionalPubSubType::compute_key( bool float_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5953,14 +5953,14 @@ bool float_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5993,18 +5993,18 @@ float_align_4_optionalPubSubType::~float_align_4_optionalPubSubType() bool float_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const float_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6023,12 +6023,12 @@ bool float_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool float_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6037,14 +6037,14 @@ bool float_align_4_optionalPubSubType::deserialize( float_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6089,8 +6089,8 @@ void float_align_4_optionalPubSubType::delete_data( } bool float_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6109,7 +6109,7 @@ bool float_align_4_optionalPubSubType::compute_key( bool float_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6133,14 +6133,14 @@ bool float_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6173,18 +6173,18 @@ double_align_1_optionalPubSubType::~double_align_1_optionalPubSubType() bool double_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const double_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6203,12 +6203,12 @@ bool double_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool double_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6217,14 +6217,14 @@ bool double_align_1_optionalPubSubType::deserialize( double_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6269,8 +6269,8 @@ void double_align_1_optionalPubSubType::delete_data( } bool double_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6289,7 +6289,7 @@ bool double_align_1_optionalPubSubType::compute_key( bool double_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6313,14 +6313,14 @@ bool double_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6353,18 +6353,18 @@ double_align_2_optionalPubSubType::~double_align_2_optionalPubSubType() bool double_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const double_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6383,12 +6383,12 @@ bool double_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool double_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6397,14 +6397,14 @@ bool double_align_2_optionalPubSubType::deserialize( double_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6449,8 +6449,8 @@ void double_align_2_optionalPubSubType::delete_data( } bool double_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6469,7 +6469,7 @@ bool double_align_2_optionalPubSubType::compute_key( bool double_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6493,14 +6493,14 @@ bool double_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6533,18 +6533,18 @@ double_align_4_optionalPubSubType::~double_align_4_optionalPubSubType() bool double_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const double_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6563,12 +6563,12 @@ bool double_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool double_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6577,14 +6577,14 @@ bool double_align_4_optionalPubSubType::deserialize( double_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6629,8 +6629,8 @@ void double_align_4_optionalPubSubType::delete_data( } bool double_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6649,7 +6649,7 @@ bool double_align_4_optionalPubSubType::compute_key( bool double_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6673,14 +6673,14 @@ bool double_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6713,18 +6713,18 @@ longdouble_align_1_optionalPubSubType::~longdouble_align_1_optionalPubSubType() bool longdouble_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longdouble_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6743,12 +6743,12 @@ bool longdouble_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longdouble_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6757,14 +6757,14 @@ bool longdouble_align_1_optionalPubSubType::deserialize( longdouble_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6809,8 +6809,8 @@ void longdouble_align_1_optionalPubSubType::delete_data( } bool longdouble_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6829,7 +6829,7 @@ bool longdouble_align_1_optionalPubSubType::compute_key( bool longdouble_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6853,14 +6853,14 @@ bool longdouble_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6893,18 +6893,18 @@ longdouble_align_2_optionalPubSubType::~longdouble_align_2_optionalPubSubType() bool longdouble_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longdouble_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6923,12 +6923,12 @@ bool longdouble_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longdouble_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6937,14 +6937,14 @@ bool longdouble_align_2_optionalPubSubType::deserialize( longdouble_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6989,8 +6989,8 @@ void longdouble_align_2_optionalPubSubType::delete_data( } bool longdouble_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7009,7 +7009,7 @@ bool longdouble_align_2_optionalPubSubType::compute_key( bool longdouble_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7033,14 +7033,14 @@ bool longdouble_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7073,18 +7073,18 @@ longdouble_align_4_optionalPubSubType::~longdouble_align_4_optionalPubSubType() bool longdouble_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const longdouble_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7103,12 +7103,12 @@ bool longdouble_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool longdouble_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7117,14 +7117,14 @@ bool longdouble_align_4_optionalPubSubType::deserialize( longdouble_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7169,8 +7169,8 @@ void longdouble_align_4_optionalPubSubType::delete_data( } bool longdouble_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7189,7 +7189,7 @@ bool longdouble_align_4_optionalPubSubType::compute_key( bool longdouble_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7213,14 +7213,14 @@ bool longdouble_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7253,18 +7253,18 @@ boolean_align_1_optionalPubSubType::~boolean_align_1_optionalPubSubType() bool boolean_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const boolean_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7283,12 +7283,12 @@ bool boolean_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool boolean_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7297,14 +7297,14 @@ bool boolean_align_1_optionalPubSubType::deserialize( boolean_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7349,8 +7349,8 @@ void boolean_align_1_optionalPubSubType::delete_data( } bool boolean_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7369,7 +7369,7 @@ bool boolean_align_1_optionalPubSubType::compute_key( bool boolean_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7393,14 +7393,14 @@ bool boolean_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7433,18 +7433,18 @@ boolean_align_2_optionalPubSubType::~boolean_align_2_optionalPubSubType() bool boolean_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const boolean_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7463,12 +7463,12 @@ bool boolean_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool boolean_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7477,14 +7477,14 @@ bool boolean_align_2_optionalPubSubType::deserialize( boolean_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7529,8 +7529,8 @@ void boolean_align_2_optionalPubSubType::delete_data( } bool boolean_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7549,7 +7549,7 @@ bool boolean_align_2_optionalPubSubType::compute_key( bool boolean_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7573,14 +7573,14 @@ bool boolean_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7613,18 +7613,18 @@ boolean_align_4_optionalPubSubType::~boolean_align_4_optionalPubSubType() bool boolean_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const boolean_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7643,12 +7643,12 @@ bool boolean_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool boolean_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7657,14 +7657,14 @@ bool boolean_align_4_optionalPubSubType::deserialize( boolean_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7709,8 +7709,8 @@ void boolean_align_4_optionalPubSubType::delete_data( } bool boolean_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7729,7 +7729,7 @@ bool boolean_align_4_optionalPubSubType::compute_key( bool boolean_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7753,14 +7753,14 @@ bool boolean_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7793,18 +7793,18 @@ octet_align_1_optionalPubSubType::~octet_align_1_optionalPubSubType() bool octet_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const octet_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7823,12 +7823,12 @@ bool octet_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool octet_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7837,14 +7837,14 @@ bool octet_align_1_optionalPubSubType::deserialize( octet_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7889,8 +7889,8 @@ void octet_align_1_optionalPubSubType::delete_data( } bool octet_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7909,7 +7909,7 @@ bool octet_align_1_optionalPubSubType::compute_key( bool octet_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7933,14 +7933,14 @@ bool octet_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7973,18 +7973,18 @@ octet_align_2_optionalPubSubType::~octet_align_2_optionalPubSubType() bool octet_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const octet_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8003,12 +8003,12 @@ bool octet_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool octet_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8017,14 +8017,14 @@ bool octet_align_2_optionalPubSubType::deserialize( octet_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8069,8 +8069,8 @@ void octet_align_2_optionalPubSubType::delete_data( } bool octet_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8089,7 +8089,7 @@ bool octet_align_2_optionalPubSubType::compute_key( bool octet_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8113,14 +8113,14 @@ bool octet_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8153,18 +8153,18 @@ octet_align_4_optionalPubSubType::~octet_align_4_optionalPubSubType() bool octet_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const octet_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8183,12 +8183,12 @@ bool octet_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool octet_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8197,14 +8197,14 @@ bool octet_align_4_optionalPubSubType::deserialize( octet_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8249,8 +8249,8 @@ void octet_align_4_optionalPubSubType::delete_data( } bool octet_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8269,7 +8269,7 @@ bool octet_align_4_optionalPubSubType::compute_key( bool octet_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8293,14 +8293,14 @@ bool octet_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8333,18 +8333,18 @@ char_align_1_optionalPubSubType::~char_align_1_optionalPubSubType() bool char_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const char_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8363,12 +8363,12 @@ bool char_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool char_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8377,14 +8377,14 @@ bool char_align_1_optionalPubSubType::deserialize( char_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8429,8 +8429,8 @@ void char_align_1_optionalPubSubType::delete_data( } bool char_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8449,7 +8449,7 @@ bool char_align_1_optionalPubSubType::compute_key( bool char_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8473,14 +8473,14 @@ bool char_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8513,18 +8513,18 @@ char_align_2_optionalPubSubType::~char_align_2_optionalPubSubType() bool char_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const char_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8543,12 +8543,12 @@ bool char_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool char_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8557,14 +8557,14 @@ bool char_align_2_optionalPubSubType::deserialize( char_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8609,8 +8609,8 @@ void char_align_2_optionalPubSubType::delete_data( } bool char_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8629,7 +8629,7 @@ bool char_align_2_optionalPubSubType::compute_key( bool char_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8653,14 +8653,14 @@ bool char_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8693,18 +8693,18 @@ char_align_4_optionalPubSubType::~char_align_4_optionalPubSubType() bool char_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const char_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8723,12 +8723,12 @@ bool char_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool char_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8737,14 +8737,14 @@ bool char_align_4_optionalPubSubType::deserialize( char_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8789,8 +8789,8 @@ void char_align_4_optionalPubSubType::delete_data( } bool char_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8809,7 +8809,7 @@ bool char_align_4_optionalPubSubType::compute_key( bool char_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8833,14 +8833,14 @@ bool char_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -8873,18 +8873,18 @@ wchar_align_1_optionalPubSubType::~wchar_align_1_optionalPubSubType() bool wchar_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const wchar_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -8903,12 +8903,12 @@ bool wchar_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool wchar_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -8917,14 +8917,14 @@ bool wchar_align_1_optionalPubSubType::deserialize( wchar_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -8969,8 +8969,8 @@ void wchar_align_1_optionalPubSubType::delete_data( } bool wchar_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -8989,7 +8989,7 @@ bool wchar_align_1_optionalPubSubType::compute_key( bool wchar_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9013,14 +9013,14 @@ bool wchar_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9053,18 +9053,18 @@ wchar_align_2_optionalPubSubType::~wchar_align_2_optionalPubSubType() bool wchar_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const wchar_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9083,12 +9083,12 @@ bool wchar_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool wchar_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9097,14 +9097,14 @@ bool wchar_align_2_optionalPubSubType::deserialize( wchar_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9149,8 +9149,8 @@ void wchar_align_2_optionalPubSubType::delete_data( } bool wchar_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9169,7 +9169,7 @@ bool wchar_align_2_optionalPubSubType::compute_key( bool wchar_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9193,14 +9193,14 @@ bool wchar_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9233,18 +9233,18 @@ wchar_align_4_optionalPubSubType::~wchar_align_4_optionalPubSubType() bool wchar_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const wchar_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9263,12 +9263,12 @@ bool wchar_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool wchar_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9277,14 +9277,14 @@ bool wchar_align_4_optionalPubSubType::deserialize( wchar_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9329,8 +9329,8 @@ void wchar_align_4_optionalPubSubType::delete_data( } bool wchar_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9349,7 +9349,7 @@ bool wchar_align_4_optionalPubSubType::compute_key( bool wchar_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9373,14 +9373,14 @@ bool wchar_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9413,18 +9413,18 @@ sequence_short_optionalPubSubType::~sequence_short_optionalPubSubType() bool sequence_short_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sequence_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9443,12 +9443,12 @@ bool sequence_short_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool sequence_short_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9457,14 +9457,14 @@ bool sequence_short_optionalPubSubType::deserialize( sequence_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9509,8 +9509,8 @@ void sequence_short_optionalPubSubType::delete_data( } bool sequence_short_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9529,7 +9529,7 @@ bool sequence_short_optionalPubSubType::compute_key( bool sequence_short_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9553,14 +9553,14 @@ bool sequence_short_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9593,18 +9593,18 @@ sequence_short_align_1_optionalPubSubType::~sequence_short_align_1_optionalPubSu bool sequence_short_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sequence_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9623,12 +9623,12 @@ bool sequence_short_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool sequence_short_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9637,14 +9637,14 @@ bool sequence_short_align_1_optionalPubSubType::deserialize( sequence_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9689,8 +9689,8 @@ void sequence_short_align_1_optionalPubSubType::delete_data( } bool sequence_short_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9709,7 +9709,7 @@ bool sequence_short_align_1_optionalPubSubType::compute_key( bool sequence_short_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9733,14 +9733,14 @@ bool sequence_short_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9773,18 +9773,18 @@ sequence_short_align_2_optionalPubSubType::~sequence_short_align_2_optionalPubSu bool sequence_short_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sequence_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9803,12 +9803,12 @@ bool sequence_short_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool sequence_short_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9817,14 +9817,14 @@ bool sequence_short_align_2_optionalPubSubType::deserialize( sequence_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -9869,8 +9869,8 @@ void sequence_short_align_2_optionalPubSubType::delete_data( } bool sequence_short_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9889,7 +9889,7 @@ bool sequence_short_align_2_optionalPubSubType::compute_key( bool sequence_short_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -9913,14 +9913,14 @@ bool sequence_short_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -9953,18 +9953,18 @@ sequence_short_align_4_optionalPubSubType::~sequence_short_align_4_optionalPubSu bool sequence_short_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const sequence_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -9983,12 +9983,12 @@ bool sequence_short_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool sequence_short_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -9997,14 +9997,14 @@ bool sequence_short_align_4_optionalPubSubType::deserialize( sequence_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10049,8 +10049,8 @@ void sequence_short_align_4_optionalPubSubType::delete_data( } bool sequence_short_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10069,7 +10069,7 @@ bool sequence_short_align_4_optionalPubSubType::compute_key( bool sequence_short_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10093,14 +10093,14 @@ bool sequence_short_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10133,18 +10133,18 @@ string_unbounded_optionalPubSubType::~string_unbounded_optionalPubSubType() bool string_unbounded_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_unbounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10163,12 +10163,12 @@ bool string_unbounded_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_unbounded_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10177,14 +10177,14 @@ bool string_unbounded_optionalPubSubType::deserialize( string_unbounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10229,8 +10229,8 @@ void string_unbounded_optionalPubSubType::delete_data( } bool string_unbounded_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10249,7 +10249,7 @@ bool string_unbounded_optionalPubSubType::compute_key( bool string_unbounded_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10273,14 +10273,14 @@ bool string_unbounded_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10313,18 +10313,18 @@ string_unbounded_align_1_optionalPubSubType::~string_unbounded_align_1_optionalP bool string_unbounded_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_unbounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10343,12 +10343,12 @@ bool string_unbounded_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_unbounded_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10357,14 +10357,14 @@ bool string_unbounded_align_1_optionalPubSubType::deserialize( string_unbounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10409,8 +10409,8 @@ void string_unbounded_align_1_optionalPubSubType::delete_data( } bool string_unbounded_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10429,7 +10429,7 @@ bool string_unbounded_align_1_optionalPubSubType::compute_key( bool string_unbounded_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10453,14 +10453,14 @@ bool string_unbounded_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10493,18 +10493,18 @@ string_unbounded_align_2_optionalPubSubType::~string_unbounded_align_2_optionalP bool string_unbounded_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_unbounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10523,12 +10523,12 @@ bool string_unbounded_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_unbounded_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10537,14 +10537,14 @@ bool string_unbounded_align_2_optionalPubSubType::deserialize( string_unbounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10589,8 +10589,8 @@ void string_unbounded_align_2_optionalPubSubType::delete_data( } bool string_unbounded_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10609,7 +10609,7 @@ bool string_unbounded_align_2_optionalPubSubType::compute_key( bool string_unbounded_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10633,14 +10633,14 @@ bool string_unbounded_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10673,18 +10673,18 @@ string_unbounded_align_4_optionalPubSubType::~string_unbounded_align_4_optionalP bool string_unbounded_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_unbounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10703,12 +10703,12 @@ bool string_unbounded_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_unbounded_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10717,14 +10717,14 @@ bool string_unbounded_align_4_optionalPubSubType::deserialize( string_unbounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10769,8 +10769,8 @@ void string_unbounded_align_4_optionalPubSubType::delete_data( } bool string_unbounded_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10789,7 +10789,7 @@ bool string_unbounded_align_4_optionalPubSubType::compute_key( bool string_unbounded_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10813,14 +10813,14 @@ bool string_unbounded_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -10853,18 +10853,18 @@ string_bounded_optionalPubSubType::~string_bounded_optionalPubSubType() bool string_bounded_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_bounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -10883,12 +10883,12 @@ bool string_bounded_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_bounded_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -10897,14 +10897,14 @@ bool string_bounded_optionalPubSubType::deserialize( string_bounded_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -10949,8 +10949,8 @@ void string_bounded_optionalPubSubType::delete_data( } bool string_bounded_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10969,7 +10969,7 @@ bool string_bounded_optionalPubSubType::compute_key( bool string_bounded_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -10993,14 +10993,14 @@ bool string_bounded_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11033,18 +11033,18 @@ string_bounded_align_1_optionalPubSubType::~string_bounded_align_1_optionalPubSu bool string_bounded_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_bounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11063,12 +11063,12 @@ bool string_bounded_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_bounded_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11077,14 +11077,14 @@ bool string_bounded_align_1_optionalPubSubType::deserialize( string_bounded_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11129,8 +11129,8 @@ void string_bounded_align_1_optionalPubSubType::delete_data( } bool string_bounded_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11149,7 +11149,7 @@ bool string_bounded_align_1_optionalPubSubType::compute_key( bool string_bounded_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11173,14 +11173,14 @@ bool string_bounded_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11213,18 +11213,18 @@ string_bounded_align_2_optionalPubSubType::~string_bounded_align_2_optionalPubSu bool string_bounded_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_bounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11243,12 +11243,12 @@ bool string_bounded_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_bounded_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11257,14 +11257,14 @@ bool string_bounded_align_2_optionalPubSubType::deserialize( string_bounded_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11309,8 +11309,8 @@ void string_bounded_align_2_optionalPubSubType::delete_data( } bool string_bounded_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11329,7 +11329,7 @@ bool string_bounded_align_2_optionalPubSubType::compute_key( bool string_bounded_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11353,14 +11353,14 @@ bool string_bounded_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11393,18 +11393,18 @@ string_bounded_align_4_optionalPubSubType::~string_bounded_align_4_optionalPubSu bool string_bounded_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const string_bounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11423,12 +11423,12 @@ bool string_bounded_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool string_bounded_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11437,14 +11437,14 @@ bool string_bounded_align_4_optionalPubSubType::deserialize( string_bounded_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11489,8 +11489,8 @@ void string_bounded_align_4_optionalPubSubType::delete_data( } bool string_bounded_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11509,7 +11509,7 @@ bool string_bounded_align_4_optionalPubSubType::compute_key( bool string_bounded_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11533,14 +11533,14 @@ bool string_bounded_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11573,18 +11573,18 @@ map_short_optionalPubSubType::~map_short_optionalPubSubType() bool map_short_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const map_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11603,12 +11603,12 @@ bool map_short_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool map_short_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11617,14 +11617,14 @@ bool map_short_optionalPubSubType::deserialize( map_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11669,8 +11669,8 @@ void map_short_optionalPubSubType::delete_data( } bool map_short_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11689,7 +11689,7 @@ bool map_short_optionalPubSubType::compute_key( bool map_short_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11713,14 +11713,14 @@ bool map_short_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11753,18 +11753,18 @@ map_short_align_1_optionalPubSubType::~map_short_align_1_optionalPubSubType() bool map_short_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const map_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11783,12 +11783,12 @@ bool map_short_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool map_short_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11797,14 +11797,14 @@ bool map_short_align_1_optionalPubSubType::deserialize( map_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -11849,8 +11849,8 @@ void map_short_align_1_optionalPubSubType::delete_data( } bool map_short_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11869,7 +11869,7 @@ bool map_short_align_1_optionalPubSubType::compute_key( bool map_short_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -11893,14 +11893,14 @@ bool map_short_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -11933,18 +11933,18 @@ map_short_align_2_optionalPubSubType::~map_short_align_2_optionalPubSubType() bool map_short_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const map_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -11963,12 +11963,12 @@ bool map_short_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool map_short_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -11977,14 +11977,14 @@ bool map_short_align_2_optionalPubSubType::deserialize( map_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12029,8 +12029,8 @@ void map_short_align_2_optionalPubSubType::delete_data( } bool map_short_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12049,7 +12049,7 @@ bool map_short_align_2_optionalPubSubType::compute_key( bool map_short_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12073,14 +12073,14 @@ bool map_short_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12113,18 +12113,18 @@ map_short_align_4_optionalPubSubType::~map_short_align_4_optionalPubSubType() bool map_short_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const map_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12143,12 +12143,12 @@ bool map_short_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool map_short_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12157,14 +12157,14 @@ bool map_short_align_4_optionalPubSubType::deserialize( map_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12209,8 +12209,8 @@ void map_short_align_4_optionalPubSubType::delete_data( } bool map_short_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12229,7 +12229,7 @@ bool map_short_align_4_optionalPubSubType::compute_key( bool map_short_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12253,14 +12253,14 @@ bool map_short_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12293,18 +12293,18 @@ array_short_optionalPubSubType::~array_short_optionalPubSubType() bool array_short_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const array_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12323,12 +12323,12 @@ bool array_short_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool array_short_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12337,14 +12337,14 @@ bool array_short_optionalPubSubType::deserialize( array_short_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12389,8 +12389,8 @@ void array_short_optionalPubSubType::delete_data( } bool array_short_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12409,7 +12409,7 @@ bool array_short_optionalPubSubType::compute_key( bool array_short_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12433,14 +12433,14 @@ bool array_short_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12473,18 +12473,18 @@ array_short_align_1_optionalPubSubType::~array_short_align_1_optionalPubSubType( bool array_short_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const array_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12503,12 +12503,12 @@ bool array_short_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool array_short_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12517,14 +12517,14 @@ bool array_short_align_1_optionalPubSubType::deserialize( array_short_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12569,8 +12569,8 @@ void array_short_align_1_optionalPubSubType::delete_data( } bool array_short_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12589,7 +12589,7 @@ bool array_short_align_1_optionalPubSubType::compute_key( bool array_short_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12613,14 +12613,14 @@ bool array_short_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12653,18 +12653,18 @@ array_short_align_2_optionalPubSubType::~array_short_align_2_optionalPubSubType( bool array_short_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const array_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12683,12 +12683,12 @@ bool array_short_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool array_short_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12697,14 +12697,14 @@ bool array_short_align_2_optionalPubSubType::deserialize( array_short_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12749,8 +12749,8 @@ void array_short_align_2_optionalPubSubType::delete_data( } bool array_short_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12769,7 +12769,7 @@ bool array_short_align_2_optionalPubSubType::compute_key( bool array_short_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12793,14 +12793,14 @@ bool array_short_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -12833,18 +12833,18 @@ array_short_align_4_optionalPubSubType::~array_short_align_4_optionalPubSubType( bool array_short_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const array_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -12863,12 +12863,12 @@ bool array_short_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool array_short_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -12877,14 +12877,14 @@ bool array_short_align_4_optionalPubSubType::deserialize( array_short_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -12929,8 +12929,8 @@ void array_short_align_4_optionalPubSubType::delete_data( } bool array_short_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12949,7 +12949,7 @@ bool array_short_align_4_optionalPubSubType::compute_key( bool array_short_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -12973,14 +12973,14 @@ bool array_short_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13013,18 +13013,18 @@ struct_optionalPubSubType::~struct_optionalPubSubType() bool struct_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13043,12 +13043,12 @@ bool struct_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13057,14 +13057,14 @@ bool struct_optionalPubSubType::deserialize( struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13109,8 +13109,8 @@ void struct_optionalPubSubType::delete_data( } bool struct_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13129,7 +13129,7 @@ bool struct_optionalPubSubType::compute_key( bool struct_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13153,14 +13153,14 @@ bool struct_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13193,18 +13193,18 @@ struct_align_1_optionalPubSubType::~struct_align_1_optionalPubSubType() bool struct_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13223,12 +13223,12 @@ bool struct_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13237,14 +13237,14 @@ bool struct_align_1_optionalPubSubType::deserialize( struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13289,8 +13289,8 @@ void struct_align_1_optionalPubSubType::delete_data( } bool struct_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13309,7 +13309,7 @@ bool struct_align_1_optionalPubSubType::compute_key( bool struct_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13333,14 +13333,14 @@ bool struct_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13373,18 +13373,18 @@ struct_align_2_optionalPubSubType::~struct_align_2_optionalPubSubType() bool struct_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13403,12 +13403,12 @@ bool struct_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13417,14 +13417,14 @@ bool struct_align_2_optionalPubSubType::deserialize( struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13469,8 +13469,8 @@ void struct_align_2_optionalPubSubType::delete_data( } bool struct_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13489,7 +13489,7 @@ bool struct_align_2_optionalPubSubType::compute_key( bool struct_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13513,14 +13513,14 @@ bool struct_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13553,18 +13553,18 @@ struct_align_4_optionalPubSubType::~struct_align_4_optionalPubSubType() bool struct_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13583,12 +13583,12 @@ bool struct_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool struct_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13597,14 +13597,14 @@ bool struct_align_4_optionalPubSubType::deserialize( struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13649,8 +13649,8 @@ void struct_align_4_optionalPubSubType::delete_data( } bool struct_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13669,7 +13669,7 @@ bool struct_align_4_optionalPubSubType::compute_key( bool struct_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13693,14 +13693,14 @@ bool struct_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13733,18 +13733,18 @@ InnerStructOptionalPubSubType::~InnerStructOptionalPubSubType() bool InnerStructOptionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const InnerStructOptional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13763,12 +13763,12 @@ bool InnerStructOptionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool InnerStructOptionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13777,14 +13777,14 @@ bool InnerStructOptionalPubSubType::deserialize( InnerStructOptional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -13829,8 +13829,8 @@ void InnerStructOptionalPubSubType::delete_data( } bool InnerStructOptionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13849,7 +13849,7 @@ bool InnerStructOptionalPubSubType::compute_key( bool InnerStructOptionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -13873,14 +13873,14 @@ bool InnerStructOptionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -13913,18 +13913,18 @@ opt_struct_optionalPubSubType::~opt_struct_optionalPubSubType() bool opt_struct_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const opt_struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -13943,12 +13943,12 @@ bool opt_struct_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool opt_struct_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -13957,14 +13957,14 @@ bool opt_struct_optionalPubSubType::deserialize( opt_struct_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14009,8 +14009,8 @@ void opt_struct_optionalPubSubType::delete_data( } bool opt_struct_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14029,7 +14029,7 @@ bool opt_struct_optionalPubSubType::compute_key( bool opt_struct_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14053,14 +14053,14 @@ bool opt_struct_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14093,18 +14093,18 @@ opt_struct_align_1_optionalPubSubType::~opt_struct_align_1_optionalPubSubType() bool opt_struct_align_1_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const opt_struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14123,12 +14123,12 @@ bool opt_struct_align_1_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool opt_struct_align_1_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14137,14 +14137,14 @@ bool opt_struct_align_1_optionalPubSubType::deserialize( opt_struct_align_1_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14189,8 +14189,8 @@ void opt_struct_align_1_optionalPubSubType::delete_data( } bool opt_struct_align_1_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14209,7 +14209,7 @@ bool opt_struct_align_1_optionalPubSubType::compute_key( bool opt_struct_align_1_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14233,14 +14233,14 @@ bool opt_struct_align_1_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14273,18 +14273,18 @@ opt_struct_align_2_optionalPubSubType::~opt_struct_align_2_optionalPubSubType() bool opt_struct_align_2_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const opt_struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14303,12 +14303,12 @@ bool opt_struct_align_2_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool opt_struct_align_2_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14317,14 +14317,14 @@ bool opt_struct_align_2_optionalPubSubType::deserialize( opt_struct_align_2_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14369,8 +14369,8 @@ void opt_struct_align_2_optionalPubSubType::delete_data( } bool opt_struct_align_2_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14389,7 +14389,7 @@ bool opt_struct_align_2_optionalPubSubType::compute_key( bool opt_struct_align_2_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14413,14 +14413,14 @@ bool opt_struct_align_2_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -14453,18 +14453,18 @@ opt_struct_align_4_optionalPubSubType::~opt_struct_align_4_optionalPubSubType() bool opt_struct_align_4_optionalPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const opt_struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -14483,12 +14483,12 @@ bool opt_struct_align_4_optionalPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool opt_struct_align_4_optionalPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -14497,14 +14497,14 @@ bool opt_struct_align_4_optionalPubSubType::deserialize( opt_struct_align_4_optional* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -14549,8 +14549,8 @@ void opt_struct_align_4_optionalPubSubType::delete_data( } bool opt_struct_align_4_optionalPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14569,7 +14569,7 @@ bool opt_struct_align_4_optionalPubSubType::compute_key( bool opt_struct_align_4_optionalPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -14593,14 +14593,14 @@ bool opt_struct_align_4_optionalPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index 6f359645f58..e3488d09480 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -55,11 +55,11 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2267,11 +2267,11 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2279,13 +2279,13 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2346,11 +2346,11 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2358,13 +2358,13 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2425,11 +2425,11 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2437,13 +2437,13 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2504,11 +2504,11 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2516,13 +2516,13 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2583,11 +2583,11 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2595,13 +2595,13 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2662,11 +2662,11 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2674,13 +2674,13 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2741,11 +2741,11 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2753,13 +2753,13 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2820,11 +2820,11 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2832,13 +2832,13 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2899,11 +2899,11 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2911,13 +2911,13 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2978,11 +2978,11 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2990,13 +2990,13 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3057,11 +3057,11 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3069,13 +3069,13 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3136,11 +3136,11 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3148,13 +3148,13 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3215,11 +3215,11 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3227,13 +3227,13 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3294,11 +3294,11 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3306,13 +3306,13 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3373,11 +3373,11 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3385,13 +3385,13 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3452,11 +3452,11 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3464,13 +3464,13 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3531,11 +3531,11 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3543,13 +3543,13 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3610,11 +3610,11 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3622,13 +3622,13 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3689,11 +3689,11 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3701,13 +3701,13 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3768,11 +3768,11 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3780,13 +3780,13 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3847,11 +3847,11 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3859,13 +3859,13 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3926,11 +3926,11 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3938,13 +3938,13 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4005,11 +4005,11 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4017,13 +4017,13 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4084,11 +4084,11 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4096,13 +4096,13 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4163,11 +4163,11 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4175,13 +4175,13 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4242,11 +4242,11 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4254,13 +4254,13 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4321,11 +4321,11 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4333,13 +4333,13 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4400,11 +4400,11 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4412,13 +4412,13 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4479,11 +4479,11 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4491,13 +4491,13 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4558,11 +4558,11 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4570,13 +4570,13 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4637,11 +4637,11 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4649,13 +4649,13 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4716,11 +4716,11 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4728,13 +4728,13 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4795,11 +4795,11 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4807,13 +4807,13 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4874,11 +4874,11 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4886,13 +4886,13 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -4953,11 +4953,11 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -4965,13 +4965,13 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5032,11 +5032,11 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5044,13 +5044,13 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5111,11 +5111,11 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5123,13 +5123,13 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5190,11 +5190,11 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5202,13 +5202,13 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5269,11 +5269,11 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5281,13 +5281,13 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5348,11 +5348,11 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5360,13 +5360,13 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5427,11 +5427,11 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5439,13 +5439,13 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5506,11 +5506,11 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5518,13 +5518,13 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5585,11 +5585,11 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5597,13 +5597,13 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5664,11 +5664,11 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5676,13 +5676,13 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5743,11 +5743,11 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5755,13 +5755,13 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5822,11 +5822,11 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5834,13 +5834,13 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5901,11 +5901,11 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5913,13 +5913,13 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -5980,11 +5980,11 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -5992,13 +5992,13 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6059,11 +6059,11 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6071,13 +6071,13 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6138,11 +6138,11 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6150,13 +6150,13 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6217,11 +6217,11 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6229,13 +6229,13 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6296,11 +6296,11 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6308,13 +6308,13 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -6375,11 +6375,11 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -6387,13 +6387,13 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/primitivesPubSubTypes.cxx b/test/dds-types-test/primitivesPubSubTypes.cxx index 3afcc2b09f6..d8073957bb7 100644 --- a/test/dds-types-test/primitivesPubSubTypes.cxx +++ b/test/dds-types-test/primitivesPubSubTypes.cxx @@ -53,18 +53,18 @@ ShortStructPubSubType::~ShortStructPubSubType() bool ShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool ShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool ShortStructPubSubType::deserialize( ShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void ShortStructPubSubType::delete_data( } bool ShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool ShortStructPubSubType::compute_key( bool ShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool ShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ UShortStructPubSubType::~UShortStructPubSubType() bool UShortStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool UShortStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UShortStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool UShortStructPubSubType::deserialize( UShortStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void UShortStructPubSubType::delete_data( } bool UShortStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool UShortStructPubSubType::compute_key( bool UShortStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool UShortStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ LongStructPubSubType::~LongStructPubSubType() bool LongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool LongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool LongStructPubSubType::deserialize( LongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void LongStructPubSubType::delete_data( } bool LongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool LongStructPubSubType::compute_key( bool LongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool LongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ ULongStructPubSubType::~ULongStructPubSubType() bool ULongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool ULongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ULongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool ULongStructPubSubType::deserialize( ULongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void ULongStructPubSubType::delete_data( } bool ULongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool ULongStructPubSubType::compute_key( bool ULongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool ULongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ LongLongStructPubSubType::~LongLongStructPubSubType() bool LongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool LongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool LongLongStructPubSubType::deserialize( LongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void LongLongStructPubSubType::delete_data( } bool LongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool LongLongStructPubSubType::compute_key( bool LongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool LongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ ULongLongStructPubSubType::~ULongLongStructPubSubType() bool ULongLongStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool ULongLongStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ULongLongStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool ULongLongStructPubSubType::deserialize( ULongLongStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void ULongLongStructPubSubType::delete_data( } bool ULongLongStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool ULongLongStructPubSubType::compute_key( bool ULongLongStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool ULongLongStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ FloatStructPubSubType::~FloatStructPubSubType() bool FloatStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool FloatStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FloatStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool FloatStructPubSubType::deserialize( FloatStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void FloatStructPubSubType::delete_data( } bool FloatStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool FloatStructPubSubType::compute_key( bool FloatStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool FloatStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ DoubleStructPubSubType::~DoubleStructPubSubType() bool DoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const DoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool DoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool DoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool DoubleStructPubSubType::deserialize( DoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void DoubleStructPubSubType::delete_data( } bool DoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool DoubleStructPubSubType::compute_key( bool DoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool DoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ LongDoubleStructPubSubType::~LongDoubleStructPubSubType() bool LongDoubleStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool LongDoubleStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LongDoubleStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool LongDoubleStructPubSubType::deserialize( LongDoubleStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void LongDoubleStructPubSubType::delete_data( } bool LongDoubleStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool LongDoubleStructPubSubType::compute_key( bool LongDoubleStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool LongDoubleStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ BooleanStructPubSubType::~BooleanStructPubSubType() bool BooleanStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool BooleanStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BooleanStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool BooleanStructPubSubType::deserialize( BooleanStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void BooleanStructPubSubType::delete_data( } bool BooleanStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool BooleanStructPubSubType::compute_key( bool BooleanStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool BooleanStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ OctetStructPubSubType::~OctetStructPubSubType() bool OctetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const OctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool OctetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool OctetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool OctetStructPubSubType::deserialize( OctetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void OctetStructPubSubType::delete_data( } bool OctetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool OctetStructPubSubType::compute_key( bool OctetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool OctetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ CharStructPubSubType::~CharStructPubSubType() bool CharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const CharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool CharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool CharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool CharStructPubSubType::deserialize( CharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void CharStructPubSubType::delete_data( } bool CharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool CharStructPubSubType::compute_key( bool CharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool CharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ WCharStructPubSubType::~WCharStructPubSubType() bool WCharStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const WCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool WCharStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool WCharStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool WCharStructPubSubType::deserialize( WCharStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void WCharStructPubSubType::delete_data( } bool WCharStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool WCharStructPubSubType::compute_key( bool WCharStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool WCharStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ Int8StructPubSubType::~Int8StructPubSubType() bool Int8StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Int8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool Int8StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Int8StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool Int8StructPubSubType::deserialize( Int8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void Int8StructPubSubType::delete_data( } bool Int8StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool Int8StructPubSubType::compute_key( bool Int8StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool Int8StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ Uint8StructPubSubType::~Uint8StructPubSubType() bool Uint8StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Uint8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool Uint8StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Uint8StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool Uint8StructPubSubType::deserialize( Uint8Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void Uint8StructPubSubType::delete_data( } bool Uint8StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool Uint8StructPubSubType::compute_key( bool Uint8StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool Uint8StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ Int16StructPubSubType::~Int16StructPubSubType() bool Int16StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Int16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool Int16StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Int16StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool Int16StructPubSubType::deserialize( Int16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void Int16StructPubSubType::delete_data( } bool Int16StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool Int16StructPubSubType::compute_key( bool Int16StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool Int16StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ Uint16StructPubSubType::~Uint16StructPubSubType() bool Uint16StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Uint16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool Uint16StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Uint16StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool Uint16StructPubSubType::deserialize( Uint16Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void Uint16StructPubSubType::delete_data( } bool Uint16StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool Uint16StructPubSubType::compute_key( bool Uint16StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool Uint16StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ Int32StructPubSubType::~Int32StructPubSubType() bool Int32StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Int32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool Int32StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Int32StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool Int32StructPubSubType::deserialize( Int32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void Int32StructPubSubType::delete_data( } bool Int32StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool Int32StructPubSubType::compute_key( bool Int32StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool Int32StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ Uint32StructPubSubType::~Uint32StructPubSubType() bool Uint32StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Uint32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool Uint32StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Uint32StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool Uint32StructPubSubType::deserialize( Uint32Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void Uint32StructPubSubType::delete_data( } bool Uint32StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool Uint32StructPubSubType::compute_key( bool Uint32StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool Uint32StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ Int64StructPubSubType::~Int64StructPubSubType() bool Int64StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Int64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool Int64StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Int64StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool Int64StructPubSubType::deserialize( Int64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void Int64StructPubSubType::delete_data( } bool Int64StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool Int64StructPubSubType::compute_key( bool Int64StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool Int64StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ Uint64StructPubSubType::~Uint64StructPubSubType() bool Uint64StructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Uint64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool Uint64StructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool Uint64StructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool Uint64StructPubSubType::deserialize( Uint64Struct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void Uint64StructPubSubType::delete_data( } bool Uint64StructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool Uint64StructPubSubType::compute_key( bool Uint64StructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool Uint64StructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index 58a21756667..5d67084dcd9 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -54,11 +54,11 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -291,11 +291,11 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -303,13 +303,13 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -370,11 +370,11 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -382,13 +382,13 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -449,11 +449,11 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -461,13 +461,13 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -528,11 +528,11 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -540,13 +540,13 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -607,11 +607,11 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -619,13 +619,13 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -686,11 +686,11 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -698,13 +698,13 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -765,11 +765,11 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -777,13 +777,13 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -844,11 +844,11 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -856,13 +856,13 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -923,11 +923,11 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -935,13 +935,13 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1002,11 +1002,11 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1014,13 +1014,13 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1081,11 +1081,11 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1093,13 +1093,13 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1160,11 +1160,11 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1172,13 +1172,13 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1239,11 +1239,11 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1251,13 +1251,13 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1318,11 +1318,11 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1330,13 +1330,13 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1397,11 +1397,11 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1409,13 +1409,13 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1476,11 +1476,11 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1488,13 +1488,13 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1555,11 +1555,11 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1567,13 +1567,13 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1634,11 +1634,11 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1646,13 +1646,13 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.cxx b/test/dds-types-test/relative_path_includePubSubTypes.cxx index be0732f22b3..ad38c2ca1ec 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.cxx +++ b/test/dds-types-test/relative_path_includePubSubTypes.cxx @@ -53,18 +53,18 @@ RelativePathIncludeStructPubSubType::~RelativePathIncludeStructPubSubType() bool RelativePathIncludeStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const RelativePathIncludeStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool RelativePathIncludeStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool RelativePathIncludeStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool RelativePathIncludeStructPubSubType::deserialize( RelativePathIncludeStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void RelativePathIncludeStructPubSubType::delete_data( } bool RelativePathIncludeStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool RelativePathIncludeStructPubSubType::compute_key( bool RelativePathIncludeStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool RelativePathIncludeStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index 8450cfe7567..17eefabf029 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -55,11 +55,11 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/sequencesPubSubTypes.cxx b/test/dds-types-test/sequencesPubSubTypes.cxx index d2b0816ebdf..de730b3450d 100644 --- a/test/dds-types-test/sequencesPubSubTypes.cxx +++ b/test/dds-types-test/sequencesPubSubTypes.cxx @@ -53,18 +53,18 @@ SequenceShortPubSubType::~SequenceShortPubSubType() bool SequenceShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool SequenceShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool SequenceShortPubSubType::deserialize( SequenceShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void SequenceShortPubSubType::delete_data( } bool SequenceShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool SequenceShortPubSubType::compute_key( bool SequenceShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool SequenceShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ SequenceUShortPubSubType::~SequenceUShortPubSubType() bool SequenceUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool SequenceUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool SequenceUShortPubSubType::deserialize( SequenceUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void SequenceUShortPubSubType::delete_data( } bool SequenceUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool SequenceUShortPubSubType::compute_key( bool SequenceUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool SequenceUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ SequenceLongPubSubType::~SequenceLongPubSubType() bool SequenceLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool SequenceLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool SequenceLongPubSubType::deserialize( SequenceLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void SequenceLongPubSubType::delete_data( } bool SequenceLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool SequenceLongPubSubType::compute_key( bool SequenceLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool SequenceLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ SequenceULongPubSubType::~SequenceULongPubSubType() bool SequenceULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool SequenceULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool SequenceULongPubSubType::deserialize( SequenceULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void SequenceULongPubSubType::delete_data( } bool SequenceULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool SequenceULongPubSubType::compute_key( bool SequenceULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool SequenceULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ SequenceLongLongPubSubType::~SequenceLongLongPubSubType() bool SequenceLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool SequenceLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool SequenceLongLongPubSubType::deserialize( SequenceLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void SequenceLongLongPubSubType::delete_data( } bool SequenceLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool SequenceLongLongPubSubType::compute_key( bool SequenceLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool SequenceLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ SequenceULongLongPubSubType::~SequenceULongLongPubSubType() bool SequenceULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool SequenceULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool SequenceULongLongPubSubType::deserialize( SequenceULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void SequenceULongLongPubSubType::delete_data( } bool SequenceULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool SequenceULongLongPubSubType::compute_key( bool SequenceULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool SequenceULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ SequenceFloatPubSubType::~SequenceFloatPubSubType() bool SequenceFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool SequenceFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool SequenceFloatPubSubType::deserialize( SequenceFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void SequenceFloatPubSubType::delete_data( } bool SequenceFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool SequenceFloatPubSubType::compute_key( bool SequenceFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool SequenceFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ SequenceDoublePubSubType::~SequenceDoublePubSubType() bool SequenceDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool SequenceDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool SequenceDoublePubSubType::deserialize( SequenceDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void SequenceDoublePubSubType::delete_data( } bool SequenceDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool SequenceDoublePubSubType::compute_key( bool SequenceDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool SequenceDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ SequenceLongDoublePubSubType::~SequenceLongDoublePubSubType() bool SequenceLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool SequenceLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool SequenceLongDoublePubSubType::deserialize( SequenceLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void SequenceLongDoublePubSubType::delete_data( } bool SequenceLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool SequenceLongDoublePubSubType::compute_key( bool SequenceLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool SequenceLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ SequenceBooleanPubSubType::~SequenceBooleanPubSubType() bool SequenceBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool SequenceBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool SequenceBooleanPubSubType::deserialize( SequenceBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void SequenceBooleanPubSubType::delete_data( } bool SequenceBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool SequenceBooleanPubSubType::compute_key( bool SequenceBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool SequenceBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ SequenceOctetPubSubType::~SequenceOctetPubSubType() bool SequenceOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool SequenceOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool SequenceOctetPubSubType::deserialize( SequenceOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void SequenceOctetPubSubType::delete_data( } bool SequenceOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool SequenceOctetPubSubType::compute_key( bool SequenceOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool SequenceOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ SequenceCharPubSubType::~SequenceCharPubSubType() bool SequenceCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool SequenceCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool SequenceCharPubSubType::deserialize( SequenceChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void SequenceCharPubSubType::delete_data( } bool SequenceCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool SequenceCharPubSubType::compute_key( bool SequenceCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool SequenceCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ SequenceWCharPubSubType::~SequenceWCharPubSubType() bool SequenceWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool SequenceWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool SequenceWCharPubSubType::deserialize( SequenceWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void SequenceWCharPubSubType::delete_data( } bool SequenceWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool SequenceWCharPubSubType::compute_key( bool SequenceWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool SequenceWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ SequenceStringPubSubType::~SequenceStringPubSubType() bool SequenceStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool SequenceStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool SequenceStringPubSubType::deserialize( SequenceString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void SequenceStringPubSubType::delete_data( } bool SequenceStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool SequenceStringPubSubType::compute_key( bool SequenceStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool SequenceStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ SequenceWStringPubSubType::~SequenceWStringPubSubType() bool SequenceWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool SequenceWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool SequenceWStringPubSubType::deserialize( SequenceWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void SequenceWStringPubSubType::delete_data( } bool SequenceWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool SequenceWStringPubSubType::compute_key( bool SequenceWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool SequenceWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ SequenceStringBoundedPubSubType::~SequenceStringBoundedPubSubType() bool SequenceStringBoundedPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool SequenceStringBoundedPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceStringBoundedPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool SequenceStringBoundedPubSubType::deserialize( SequenceStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void SequenceStringBoundedPubSubType::delete_data( } bool SequenceStringBoundedPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool SequenceStringBoundedPubSubType::compute_key( bool SequenceStringBoundedPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool SequenceStringBoundedPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ SequenceWStringBoundedPubSubType::~SequenceWStringBoundedPubSubType() bool SequenceWStringBoundedPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceWStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool SequenceWStringBoundedPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceWStringBoundedPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool SequenceWStringBoundedPubSubType::deserialize( SequenceWStringBounded* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void SequenceWStringBoundedPubSubType::delete_data( } bool SequenceWStringBoundedPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool SequenceWStringBoundedPubSubType::compute_key( bool SequenceWStringBoundedPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool SequenceWStringBoundedPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ SequenceEnumPubSubType::~SequenceEnumPubSubType() bool SequenceEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool SequenceEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool SequenceEnumPubSubType::deserialize( SequenceEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void SequenceEnumPubSubType::delete_data( } bool SequenceEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool SequenceEnumPubSubType::compute_key( bool SequenceEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool SequenceEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ SequenceBitMaskPubSubType::~SequenceBitMaskPubSubType() bool SequenceBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool SequenceBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool SequenceBitMaskPubSubType::deserialize( SequenceBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void SequenceBitMaskPubSubType::delete_data( } bool SequenceBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool SequenceBitMaskPubSubType::compute_key( bool SequenceBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool SequenceBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ SequenceAliasPubSubType::~SequenceAliasPubSubType() bool SequenceAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool SequenceAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool SequenceAliasPubSubType::deserialize( SequenceAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void SequenceAliasPubSubType::delete_data( } bool SequenceAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool SequenceAliasPubSubType::compute_key( bool SequenceAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool SequenceAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ SequenceShortArrayPubSubType::~SequenceShortArrayPubSubType() bool SequenceShortArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool SequenceShortArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceShortArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool SequenceShortArrayPubSubType::deserialize( SequenceShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void SequenceShortArrayPubSubType::delete_data( } bool SequenceShortArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool SequenceShortArrayPubSubType::compute_key( bool SequenceShortArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool SequenceShortArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ SequenceSequencePubSubType::~SequenceSequencePubSubType() bool SequenceSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool SequenceSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool SequenceSequencePubSubType::deserialize( SequenceSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void SequenceSequencePubSubType::delete_data( } bool SequenceSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool SequenceSequencePubSubType::compute_key( bool SequenceSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool SequenceSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ SequenceMapPubSubType::~SequenceMapPubSubType() bool SequenceMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool SequenceMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool SequenceMapPubSubType::deserialize( SequenceMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void SequenceMapPubSubType::delete_data( } bool SequenceMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool SequenceMapPubSubType::compute_key( bool SequenceMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool SequenceMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ SequenceUnionPubSubType::~SequenceUnionPubSubType() bool SequenceUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool SequenceUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool SequenceUnionPubSubType::deserialize( SequenceUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void SequenceUnionPubSubType::delete_data( } bool SequenceUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool SequenceUnionPubSubType::compute_key( bool SequenceUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool SequenceUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ SequenceStructurePubSubType::~SequenceStructurePubSubType() bool SequenceStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool SequenceStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool SequenceStructurePubSubType::deserialize( SequenceStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void SequenceStructurePubSubType::delete_data( } bool SequenceStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool SequenceStructurePubSubType::compute_key( bool SequenceStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool SequenceStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ SequenceBitsetPubSubType::~SequenceBitsetPubSubType() bool SequenceBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool SequenceBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool SequenceBitsetPubSubType::deserialize( SequenceBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void SequenceBitsetPubSubType::delete_data( } bool SequenceBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool SequenceBitsetPubSubType::compute_key( bool SequenceBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool SequenceBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ BoundedSmallSequencesPubSubType::~BoundedSmallSequencesPubSubType() bool BoundedSmallSequencesPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedSmallSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool BoundedSmallSequencesPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedSmallSequencesPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool BoundedSmallSequencesPubSubType::deserialize( BoundedSmallSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void BoundedSmallSequencesPubSubType::delete_data( } bool BoundedSmallSequencesPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool BoundedSmallSequencesPubSubType::compute_key( bool BoundedSmallSequencesPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool BoundedSmallSequencesPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ BoundedBigSequencesPubSubType::~BoundedBigSequencesPubSubType() bool BoundedBigSequencesPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BoundedBigSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool BoundedBigSequencesPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BoundedBigSequencesPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool BoundedBigSequencesPubSubType::deserialize( BoundedBigSequences* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void BoundedBigSequencesPubSubType::delete_data( } bool BoundedBigSequencesPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool BoundedBigSequencesPubSubType::compute_key( bool BoundedBigSequencesPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool BoundedBigSequencesPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index 9af10371370..7692db289a8 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -55,11 +55,11 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/stringsPubSubTypes.cxx b/test/dds-types-test/stringsPubSubTypes.cxx index abe68a06bd2..08203e8ddb7 100644 --- a/test/dds-types-test/stringsPubSubTypes.cxx +++ b/test/dds-types-test/stringsPubSubTypes.cxx @@ -53,18 +53,18 @@ StringStructPubSubType::~StringStructPubSubType() bool StringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool StringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool StringStructPubSubType::deserialize( StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void StringStructPubSubType::delete_data( } bool StringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool StringStructPubSubType::compute_key( bool StringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool StringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ WStringStructPubSubType::~WStringStructPubSubType() bool WStringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const WStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool WStringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool WStringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool WStringStructPubSubType::deserialize( WStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void WStringStructPubSubType::delete_data( } bool WStringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool WStringStructPubSubType::compute_key( bool WStringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool WStringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ SmallStringStructPubSubType::~SmallStringStructPubSubType() bool SmallStringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SmallStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool SmallStringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SmallStringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool SmallStringStructPubSubType::deserialize( SmallStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void SmallStringStructPubSubType::delete_data( } bool SmallStringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool SmallStringStructPubSubType::compute_key( bool SmallStringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool SmallStringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ SmallWStringStructPubSubType::~SmallWStringStructPubSubType() bool SmallWStringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SmallWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool SmallWStringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SmallWStringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool SmallWStringStructPubSubType::deserialize( SmallWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void SmallWStringStructPubSubType::delete_data( } bool SmallWStringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool SmallWStringStructPubSubType::compute_key( bool SmallWStringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool SmallWStringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ LargeStringStructPubSubType::~LargeStringStructPubSubType() bool LargeStringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LargeStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool LargeStringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LargeStringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool LargeStringStructPubSubType::deserialize( LargeStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void LargeStringStructPubSubType::delete_data( } bool LargeStringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool LargeStringStructPubSubType::compute_key( bool LargeStringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool LargeStringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ LargeWStringStructPubSubType::~LargeWStringStructPubSubType() bool LargeWStringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const LargeWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool LargeWStringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool LargeWStringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool LargeWStringStructPubSubType::deserialize( LargeWStringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void LargeWStringStructPubSubType::delete_data( } bool LargeWStringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool LargeWStringStructPubSubType::compute_key( bool LargeWStringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool LargeWStringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index cb18f5cd235..c2f6f265748 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -54,11 +54,11 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -291,11 +291,11 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -303,13 +303,13 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -370,11 +370,11 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -382,13 +382,13 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -449,11 +449,11 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -461,13 +461,13 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/structuresPubSubTypes.cxx b/test/dds-types-test/structuresPubSubTypes.cxx index 004ad7acf08..f3badc858d4 100644 --- a/test/dds-types-test/structuresPubSubTypes.cxx +++ b/test/dds-types-test/structuresPubSubTypes.cxx @@ -53,18 +53,18 @@ StructShortPubSubType::~StructShortPubSubType() bool StructShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool StructShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool StructShortPubSubType::deserialize( StructShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void StructShortPubSubType::delete_data( } bool StructShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool StructShortPubSubType::compute_key( bool StructShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool StructShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ StructUnsignedShortPubSubType::~StructUnsignedShortPubSubType() bool StructUnsignedShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool StructUnsignedShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructUnsignedShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool StructUnsignedShortPubSubType::deserialize( StructUnsignedShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void StructUnsignedShortPubSubType::delete_data( } bool StructUnsignedShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool StructUnsignedShortPubSubType::compute_key( bool StructUnsignedShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool StructUnsignedShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ StructLongPubSubType::~StructLongPubSubType() bool StructLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool StructLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool StructLongPubSubType::deserialize( StructLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void StructLongPubSubType::delete_data( } bool StructLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool StructLongPubSubType::compute_key( bool StructLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool StructLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ StructUnsignedLongPubSubType::~StructUnsignedLongPubSubType() bool StructUnsignedLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool StructUnsignedLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructUnsignedLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool StructUnsignedLongPubSubType::deserialize( StructUnsignedLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void StructUnsignedLongPubSubType::delete_data( } bool StructUnsignedLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool StructUnsignedLongPubSubType::compute_key( bool StructUnsignedLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool StructUnsignedLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ StructLongLongPubSubType::~StructLongLongPubSubType() bool StructLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool StructLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool StructLongLongPubSubType::deserialize( StructLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void StructLongLongPubSubType::delete_data( } bool StructLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool StructLongLongPubSubType::compute_key( bool StructLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool StructLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ StructUnsignedLongLongPubSubType::~StructUnsignedLongLongPubSubType() bool StructUnsignedLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool StructUnsignedLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructUnsignedLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool StructUnsignedLongLongPubSubType::deserialize( StructUnsignedLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void StructUnsignedLongLongPubSubType::delete_data( } bool StructUnsignedLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool StructUnsignedLongLongPubSubType::compute_key( bool StructUnsignedLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool StructUnsignedLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ StructFloatPubSubType::~StructFloatPubSubType() bool StructFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool StructFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool StructFloatPubSubType::deserialize( StructFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void StructFloatPubSubType::delete_data( } bool StructFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool StructFloatPubSubType::compute_key( bool StructFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool StructFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ StructDoublePubSubType::~StructDoublePubSubType() bool StructDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool StructDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool StructDoublePubSubType::deserialize( StructDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void StructDoublePubSubType::delete_data( } bool StructDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool StructDoublePubSubType::compute_key( bool StructDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool StructDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ StructLongDoublePubSubType::~StructLongDoublePubSubType() bool StructLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool StructLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool StructLongDoublePubSubType::deserialize( StructLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void StructLongDoublePubSubType::delete_data( } bool StructLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool StructLongDoublePubSubType::compute_key( bool StructLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool StructLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ StructBooleanPubSubType::~StructBooleanPubSubType() bool StructBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool StructBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool StructBooleanPubSubType::deserialize( StructBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void StructBooleanPubSubType::delete_data( } bool StructBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool StructBooleanPubSubType::compute_key( bool StructBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool StructBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ StructOctetPubSubType::~StructOctetPubSubType() bool StructOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool StructOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool StructOctetPubSubType::deserialize( StructOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void StructOctetPubSubType::delete_data( } bool StructOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool StructOctetPubSubType::compute_key( bool StructOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool StructOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ StructChar8PubSubType::~StructChar8PubSubType() bool StructChar8PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool StructChar8PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructChar8PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool StructChar8PubSubType::deserialize( StructChar8* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void StructChar8PubSubType::delete_data( } bool StructChar8PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool StructChar8PubSubType::compute_key( bool StructChar8PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool StructChar8PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ StructChar16PubSubType::~StructChar16PubSubType() bool StructChar16PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool StructChar16PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructChar16PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool StructChar16PubSubType::deserialize( StructChar16* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void StructChar16PubSubType::delete_data( } bool StructChar16PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool StructChar16PubSubType::compute_key( bool StructChar16PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool StructChar16PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ StructStringPubSubType::~StructStringPubSubType() bool StructStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool StructStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool StructStringPubSubType::deserialize( StructString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void StructStringPubSubType::delete_data( } bool StructStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool StructStringPubSubType::compute_key( bool StructStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool StructStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ StructWStringPubSubType::~StructWStringPubSubType() bool StructWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool StructWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool StructWStringPubSubType::deserialize( StructWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void StructWStringPubSubType::delete_data( } bool StructWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool StructWStringPubSubType::compute_key( bool StructWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool StructWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ StructBoundedStringPubSubType::~StructBoundedStringPubSubType() bool StructBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool StructBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool StructBoundedStringPubSubType::deserialize( StructBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void StructBoundedStringPubSubType::delete_data( } bool StructBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool StructBoundedStringPubSubType::compute_key( bool StructBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool StructBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ StructBoundedWStringPubSubType::~StructBoundedWStringPubSubType() bool StructBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool StructBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool StructBoundedWStringPubSubType::deserialize( StructBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void StructBoundedWStringPubSubType::delete_data( } bool StructBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool StructBoundedWStringPubSubType::compute_key( bool StructBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool StructBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ StructEnumPubSubType::~StructEnumPubSubType() bool StructEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool StructEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool StructEnumPubSubType::deserialize( StructEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void StructEnumPubSubType::delete_data( } bool StructEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool StructEnumPubSubType::compute_key( bool StructEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool StructEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ StructBitMaskPubSubType::~StructBitMaskPubSubType() bool StructBitMaskPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool StructBitMaskPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructBitMaskPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool StructBitMaskPubSubType::deserialize( StructBitMask* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void StructBitMaskPubSubType::delete_data( } bool StructBitMaskPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool StructBitMaskPubSubType::compute_key( bool StructBitMaskPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool StructBitMaskPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ StructAliasPubSubType::~StructAliasPubSubType() bool StructAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool StructAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool StructAliasPubSubType::deserialize( StructAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void StructAliasPubSubType::delete_data( } bool StructAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool StructAliasPubSubType::compute_key( bool StructAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool StructAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ StructShortArrayPubSubType::~StructShortArrayPubSubType() bool StructShortArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool StructShortArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructShortArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool StructShortArrayPubSubType::deserialize( StructShortArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void StructShortArrayPubSubType::delete_data( } bool StructShortArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool StructShortArrayPubSubType::compute_key( bool StructShortArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool StructShortArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ StructSequencePubSubType::~StructSequencePubSubType() bool StructSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool StructSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool StructSequencePubSubType::deserialize( StructSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void StructSequencePubSubType::delete_data( } bool StructSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool StructSequencePubSubType::compute_key( bool StructSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool StructSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ StructMapPubSubType::~StructMapPubSubType() bool StructMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool StructMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool StructMapPubSubType::deserialize( StructMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void StructMapPubSubType::delete_data( } bool StructMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool StructMapPubSubType::compute_key( bool StructMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool StructMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ StructUnionPubSubType::~StructUnionPubSubType() bool StructUnionPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool StructUnionPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructUnionPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool StructUnionPubSubType::deserialize( StructUnion* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void StructUnionPubSubType::delete_data( } bool StructUnionPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool StructUnionPubSubType::compute_key( bool StructUnionPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool StructUnionPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ StructStructurePubSubType::~StructStructurePubSubType() bool StructStructurePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool StructStructurePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructStructurePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool StructStructurePubSubType::deserialize( StructStructure* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void StructStructurePubSubType::delete_data( } bool StructStructurePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool StructStructurePubSubType::compute_key( bool StructStructurePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool StructStructurePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ StructBitsetPubSubType::~StructBitsetPubSubType() bool StructBitsetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool StructBitsetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructBitsetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool StructBitsetPubSubType::deserialize( StructBitset* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void StructBitsetPubSubType::delete_data( } bool StructBitsetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool StructBitsetPubSubType::compute_key( bool StructBitsetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool StructBitsetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ StructEmptyPubSubType::~StructEmptyPubSubType() bool StructEmptyPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructEmpty* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool StructEmptyPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructEmptyPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool StructEmptyPubSubType::deserialize( StructEmpty* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void StructEmptyPubSubType::delete_data( } bool StructEmptyPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool StructEmptyPubSubType::compute_key( bool StructEmptyPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool StructEmptyPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ StructuresPubSubType::~StructuresPubSubType() bool StructuresPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const Structures* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool StructuresPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructuresPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool StructuresPubSubType::deserialize( Structures* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void StructuresPubSubType::delete_data( } bool StructuresPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool StructuresPubSubType::compute_key( bool StructuresPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool StructuresPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5094,18 +5094,18 @@ namespace testing_1 { bool fooPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5124,12 +5124,12 @@ namespace testing_1 { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool fooPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5138,14 +5138,14 @@ namespace testing_1 { foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5190,8 +5190,8 @@ namespace testing_1 { } bool fooPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5210,7 +5210,7 @@ namespace testing_1 { bool fooPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5234,14 +5234,14 @@ namespace testing_1 { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5277,18 +5277,18 @@ namespace testing_2 { bool fooPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5307,12 +5307,12 @@ namespace testing_2 { } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool fooPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5321,14 +5321,14 @@ namespace testing_2 { foo* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5373,8 +5373,8 @@ namespace testing_2 { } bool fooPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5393,7 +5393,7 @@ namespace testing_2 { bool fooPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5417,14 +5417,14 @@ namespace testing_2 { md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5459,18 +5459,18 @@ barPubSubType::~barPubSubType() bool barPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const bar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5489,12 +5489,12 @@ bool barPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool barPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5503,14 +5503,14 @@ bool barPubSubType::deserialize( bar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5555,8 +5555,8 @@ void barPubSubType::delete_data( } bool barPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5575,7 +5575,7 @@ bool barPubSubType::compute_key( bool barPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5599,14 +5599,14 @@ bool barPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5639,18 +5639,18 @@ root1PubSubType::~root1PubSubType() bool root1PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const root1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5669,12 +5669,12 @@ bool root1PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool root1PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5683,14 +5683,14 @@ bool root1PubSubType::deserialize( root1* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5735,8 +5735,8 @@ void root1PubSubType::delete_data( } bool root1PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5755,7 +5755,7 @@ bool root1PubSubType::compute_key( bool root1PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5779,14 +5779,14 @@ bool root1PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5819,18 +5819,18 @@ root2PubSubType::~root2PubSubType() bool root2PubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const root2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5849,12 +5849,12 @@ bool root2PubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool root2PubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5863,14 +5863,14 @@ bool root2PubSubType::deserialize( root2* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5915,8 +5915,8 @@ void root2PubSubType::delete_data( } bool root2PubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5935,7 +5935,7 @@ bool root2PubSubType::compute_key( bool root2PubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5959,14 +5959,14 @@ bool root2PubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5999,18 +5999,18 @@ rootPubSubType::~rootPubSubType() bool rootPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const root* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6029,12 +6029,12 @@ bool rootPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool rootPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6043,14 +6043,14 @@ bool rootPubSubType::deserialize( root* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6095,8 +6095,8 @@ void rootPubSubType::delete_data( } bool rootPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6115,7 +6115,7 @@ bool rootPubSubType::compute_key( bool rootPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6139,14 +6139,14 @@ bool rootPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index 999416994b5..39e67020ed6 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -55,11 +55,11 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2269,11 +2269,11 @@ namespace testing_1 eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2281,13 +2281,13 @@ namespace testing_1 eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2351,11 +2351,11 @@ namespace testing_2 eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2363,13 +2363,13 @@ namespace testing_2 eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2431,11 +2431,11 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2443,13 +2443,13 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2510,11 +2510,11 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2522,13 +2522,13 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2589,11 +2589,11 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2601,13 +2601,13 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2668,11 +2668,11 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2680,13 +2680,13 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/dds-types-test/unionsPubSubTypes.cxx b/test/dds-types-test/unionsPubSubTypes.cxx index 1d6605c46e5..e6a15fea142 100644 --- a/test/dds-types-test/unionsPubSubTypes.cxx +++ b/test/dds-types-test/unionsPubSubTypes.cxx @@ -53,18 +53,18 @@ UnionShortPubSubType::~UnionShortPubSubType() bool UnionShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool UnionShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool UnionShortPubSubType::deserialize( UnionShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void UnionShortPubSubType::delete_data( } bool UnionShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool UnionShortPubSubType::compute_key( bool UnionShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool UnionShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ UnionUShortPubSubType::~UnionUShortPubSubType() bool UnionUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool UnionUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool UnionUShortPubSubType::deserialize( UnionUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void UnionUShortPubSubType::delete_data( } bool UnionUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool UnionUShortPubSubType::compute_key( bool UnionUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool UnionUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ UnionLongPubSubType::~UnionLongPubSubType() bool UnionLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool UnionLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool UnionLongPubSubType::deserialize( UnionLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void UnionLongPubSubType::delete_data( } bool UnionLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool UnionLongPubSubType::compute_key( bool UnionLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool UnionLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ UnionULongPubSubType::~UnionULongPubSubType() bool UnionULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool UnionULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool UnionULongPubSubType::deserialize( UnionULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void UnionULongPubSubType::delete_data( } bool UnionULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool UnionULongPubSubType::compute_key( bool UnionULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool UnionULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -773,18 +773,18 @@ UnionLongLongPubSubType::~UnionLongLongPubSubType() bool UnionLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -803,12 +803,12 @@ bool UnionLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -817,14 +817,14 @@ bool UnionLongLongPubSubType::deserialize( UnionLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -869,8 +869,8 @@ void UnionLongLongPubSubType::delete_data( } bool UnionLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -889,7 +889,7 @@ bool UnionLongLongPubSubType::compute_key( bool UnionLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -913,14 +913,14 @@ bool UnionLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -953,18 +953,18 @@ UnionULongLongPubSubType::~UnionULongLongPubSubType() bool UnionULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -983,12 +983,12 @@ bool UnionULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -997,14 +997,14 @@ bool UnionULongLongPubSubType::deserialize( UnionULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1049,8 +1049,8 @@ void UnionULongLongPubSubType::delete_data( } bool UnionULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1069,7 +1069,7 @@ bool UnionULongLongPubSubType::compute_key( bool UnionULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1093,14 +1093,14 @@ bool UnionULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1133,18 +1133,18 @@ UnionFloatPubSubType::~UnionFloatPubSubType() bool UnionFloatPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1163,12 +1163,12 @@ bool UnionFloatPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionFloatPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1177,14 +1177,14 @@ bool UnionFloatPubSubType::deserialize( UnionFloat* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1229,8 +1229,8 @@ void UnionFloatPubSubType::delete_data( } bool UnionFloatPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1249,7 +1249,7 @@ bool UnionFloatPubSubType::compute_key( bool UnionFloatPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1273,14 +1273,14 @@ bool UnionFloatPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1313,18 +1313,18 @@ UnionDoublePubSubType::~UnionDoublePubSubType() bool UnionDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1343,12 +1343,12 @@ bool UnionDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1357,14 +1357,14 @@ bool UnionDoublePubSubType::deserialize( UnionDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1409,8 +1409,8 @@ void UnionDoublePubSubType::delete_data( } bool UnionDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1429,7 +1429,7 @@ bool UnionDoublePubSubType::compute_key( bool UnionDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1453,14 +1453,14 @@ bool UnionDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1493,18 +1493,18 @@ UnionLongDoublePubSubType::~UnionLongDoublePubSubType() bool UnionLongDoublePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1523,12 +1523,12 @@ bool UnionLongDoublePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionLongDoublePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1537,14 +1537,14 @@ bool UnionLongDoublePubSubType::deserialize( UnionLongDouble* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1589,8 +1589,8 @@ void UnionLongDoublePubSubType::delete_data( } bool UnionLongDoublePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1609,7 +1609,7 @@ bool UnionLongDoublePubSubType::compute_key( bool UnionLongDoublePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1633,14 +1633,14 @@ bool UnionLongDoublePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1673,18 +1673,18 @@ UnionBooleanPubSubType::~UnionBooleanPubSubType() bool UnionBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1703,12 +1703,12 @@ bool UnionBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1717,14 +1717,14 @@ bool UnionBooleanPubSubType::deserialize( UnionBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1769,8 +1769,8 @@ void UnionBooleanPubSubType::delete_data( } bool UnionBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1789,7 +1789,7 @@ bool UnionBooleanPubSubType::compute_key( bool UnionBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1813,14 +1813,14 @@ bool UnionBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -1853,18 +1853,18 @@ UnionOctetPubSubType::~UnionOctetPubSubType() bool UnionOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -1883,12 +1883,12 @@ bool UnionOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -1897,14 +1897,14 @@ bool UnionOctetPubSubType::deserialize( UnionOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -1949,8 +1949,8 @@ void UnionOctetPubSubType::delete_data( } bool UnionOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1969,7 +1969,7 @@ bool UnionOctetPubSubType::compute_key( bool UnionOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -1993,14 +1993,14 @@ bool UnionOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2033,18 +2033,18 @@ UnionCharPubSubType::~UnionCharPubSubType() bool UnionCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2063,12 +2063,12 @@ bool UnionCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2077,14 +2077,14 @@ bool UnionCharPubSubType::deserialize( UnionChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2129,8 +2129,8 @@ void UnionCharPubSubType::delete_data( } bool UnionCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2149,7 +2149,7 @@ bool UnionCharPubSubType::compute_key( bool UnionCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2173,14 +2173,14 @@ bool UnionCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2213,18 +2213,18 @@ UnionWCharPubSubType::~UnionWCharPubSubType() bool UnionWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2243,12 +2243,12 @@ bool UnionWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2257,14 +2257,14 @@ bool UnionWCharPubSubType::deserialize( UnionWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2309,8 +2309,8 @@ void UnionWCharPubSubType::delete_data( } bool UnionWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2329,7 +2329,7 @@ bool UnionWCharPubSubType::compute_key( bool UnionWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2353,14 +2353,14 @@ bool UnionWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2393,18 +2393,18 @@ UnionStringPubSubType::~UnionStringPubSubType() bool UnionStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2423,12 +2423,12 @@ bool UnionStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2437,14 +2437,14 @@ bool UnionStringPubSubType::deserialize( UnionString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2489,8 +2489,8 @@ void UnionStringPubSubType::delete_data( } bool UnionStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2509,7 +2509,7 @@ bool UnionStringPubSubType::compute_key( bool UnionStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2533,14 +2533,14 @@ bool UnionStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2573,18 +2573,18 @@ UnionWStringPubSubType::~UnionWStringPubSubType() bool UnionWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2603,12 +2603,12 @@ bool UnionWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2617,14 +2617,14 @@ bool UnionWStringPubSubType::deserialize( UnionWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2669,8 +2669,8 @@ void UnionWStringPubSubType::delete_data( } bool UnionWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2689,7 +2689,7 @@ bool UnionWStringPubSubType::compute_key( bool UnionWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2713,14 +2713,14 @@ bool UnionWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2753,18 +2753,18 @@ UnionBoundedStringPubSubType::~UnionBoundedStringPubSubType() bool UnionBoundedStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2783,12 +2783,12 @@ bool UnionBoundedStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionBoundedStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2797,14 +2797,14 @@ bool UnionBoundedStringPubSubType::deserialize( UnionBoundedString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -2849,8 +2849,8 @@ void UnionBoundedStringPubSubType::delete_data( } bool UnionBoundedStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2869,7 +2869,7 @@ bool UnionBoundedStringPubSubType::compute_key( bool UnionBoundedStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -2893,14 +2893,14 @@ bool UnionBoundedStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -2933,18 +2933,18 @@ UnionBoundedWStringPubSubType::~UnionBoundedWStringPubSubType() bool UnionBoundedWStringPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -2963,12 +2963,12 @@ bool UnionBoundedWStringPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionBoundedWStringPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -2977,14 +2977,14 @@ bool UnionBoundedWStringPubSubType::deserialize( UnionBoundedWString* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3029,8 +3029,8 @@ void UnionBoundedWStringPubSubType::delete_data( } bool UnionBoundedWStringPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3049,7 +3049,7 @@ bool UnionBoundedWStringPubSubType::compute_key( bool UnionBoundedWStringPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3073,14 +3073,14 @@ bool UnionBoundedWStringPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3113,18 +3113,18 @@ UnionInnerEnumHelperPubSubType::~UnionInnerEnumHelperPubSubType() bool UnionInnerEnumHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3143,12 +3143,12 @@ bool UnionInnerEnumHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerEnumHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3157,14 +3157,14 @@ bool UnionInnerEnumHelperPubSubType::deserialize( UnionInnerEnumHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3209,8 +3209,8 @@ void UnionInnerEnumHelperPubSubType::delete_data( } bool UnionInnerEnumHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3229,7 +3229,7 @@ bool UnionInnerEnumHelperPubSubType::compute_key( bool UnionInnerEnumHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3253,14 +3253,14 @@ bool UnionInnerEnumHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3293,18 +3293,18 @@ UnionInnerBitMaskHelperPubSubType::~UnionInnerBitMaskHelperPubSubType() bool UnionInnerBitMaskHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3323,12 +3323,12 @@ bool UnionInnerBitMaskHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerBitMaskHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3337,14 +3337,14 @@ bool UnionInnerBitMaskHelperPubSubType::deserialize( UnionInnerBitMaskHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3389,8 +3389,8 @@ void UnionInnerBitMaskHelperPubSubType::delete_data( } bool UnionInnerBitMaskHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3409,7 +3409,7 @@ bool UnionInnerBitMaskHelperPubSubType::compute_key( bool UnionInnerBitMaskHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3433,14 +3433,14 @@ bool UnionInnerBitMaskHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3473,18 +3473,18 @@ UnionInnerAliasHelperPubSubType::~UnionInnerAliasHelperPubSubType() bool UnionInnerAliasHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3503,12 +3503,12 @@ bool UnionInnerAliasHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerAliasHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3517,14 +3517,14 @@ bool UnionInnerAliasHelperPubSubType::deserialize( UnionInnerAliasHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3569,8 +3569,8 @@ void UnionInnerAliasHelperPubSubType::delete_data( } bool UnionInnerAliasHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3589,7 +3589,7 @@ bool UnionInnerAliasHelperPubSubType::compute_key( bool UnionInnerAliasHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3613,14 +3613,14 @@ bool UnionInnerAliasHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3653,18 +3653,18 @@ UnionArrayPubSubType::~UnionArrayPubSubType() bool UnionArrayPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3683,12 +3683,12 @@ bool UnionArrayPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionArrayPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3697,14 +3697,14 @@ bool UnionArrayPubSubType::deserialize( UnionArray* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3749,8 +3749,8 @@ void UnionArrayPubSubType::delete_data( } bool UnionArrayPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3769,7 +3769,7 @@ bool UnionArrayPubSubType::compute_key( bool UnionArrayPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3793,14 +3793,14 @@ bool UnionArrayPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -3833,18 +3833,18 @@ UnionSequencePubSubType::~UnionSequencePubSubType() bool UnionSequencePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -3863,12 +3863,12 @@ bool UnionSequencePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionSequencePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -3877,14 +3877,14 @@ bool UnionSequencePubSubType::deserialize( UnionSequence* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -3929,8 +3929,8 @@ void UnionSequencePubSubType::delete_data( } bool UnionSequencePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3949,7 +3949,7 @@ bool UnionSequencePubSubType::compute_key( bool UnionSequencePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -3973,14 +3973,14 @@ bool UnionSequencePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4013,18 +4013,18 @@ UnionMapPubSubType::~UnionMapPubSubType() bool UnionMapPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4043,12 +4043,12 @@ bool UnionMapPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionMapPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4057,14 +4057,14 @@ bool UnionMapPubSubType::deserialize( UnionMap* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4109,8 +4109,8 @@ void UnionMapPubSubType::delete_data( } bool UnionMapPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4129,7 +4129,7 @@ bool UnionMapPubSubType::compute_key( bool UnionMapPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4153,14 +4153,14 @@ bool UnionMapPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4193,18 +4193,18 @@ UnionInnerUnionHelperPubSubType::~UnionInnerUnionHelperPubSubType() bool UnionInnerUnionHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4223,12 +4223,12 @@ bool UnionInnerUnionHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerUnionHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4237,14 +4237,14 @@ bool UnionInnerUnionHelperPubSubType::deserialize( UnionInnerUnionHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4289,8 +4289,8 @@ void UnionInnerUnionHelperPubSubType::delete_data( } bool UnionInnerUnionHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4309,7 +4309,7 @@ bool UnionInnerUnionHelperPubSubType::compute_key( bool UnionInnerUnionHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4333,14 +4333,14 @@ bool UnionInnerUnionHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4373,18 +4373,18 @@ UnionInnerStructureHelperPubSubType::~UnionInnerStructureHelperPubSubType() bool UnionInnerStructureHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4403,12 +4403,12 @@ bool UnionInnerStructureHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerStructureHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4417,14 +4417,14 @@ bool UnionInnerStructureHelperPubSubType::deserialize( UnionInnerStructureHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4469,8 +4469,8 @@ void UnionInnerStructureHelperPubSubType::delete_data( } bool UnionInnerStructureHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4489,7 +4489,7 @@ bool UnionInnerStructureHelperPubSubType::compute_key( bool UnionInnerStructureHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4513,14 +4513,14 @@ bool UnionInnerStructureHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4553,18 +4553,18 @@ UnionInnerBitsetHelperPubSubType::~UnionInnerBitsetHelperPubSubType() bool UnionInnerBitsetHelperPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4583,12 +4583,12 @@ bool UnionInnerBitsetHelperPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionInnerBitsetHelperPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4597,14 +4597,14 @@ bool UnionInnerBitsetHelperPubSubType::deserialize( UnionInnerBitsetHelper* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4649,8 +4649,8 @@ void UnionInnerBitsetHelperPubSubType::delete_data( } bool UnionInnerBitsetHelperPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4669,7 +4669,7 @@ bool UnionInnerBitsetHelperPubSubType::compute_key( bool UnionInnerBitsetHelperPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4693,14 +4693,14 @@ bool UnionInnerBitsetHelperPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4733,18 +4733,18 @@ UnionDiscriminatorShortPubSubType::~UnionDiscriminatorShortPubSubType() bool UnionDiscriminatorShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4763,12 +4763,12 @@ bool UnionDiscriminatorShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4777,14 +4777,14 @@ bool UnionDiscriminatorShortPubSubType::deserialize( UnionDiscriminatorShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -4829,8 +4829,8 @@ void UnionDiscriminatorShortPubSubType::delete_data( } bool UnionDiscriminatorShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4849,7 +4849,7 @@ bool UnionDiscriminatorShortPubSubType::compute_key( bool UnionDiscriminatorShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -4873,14 +4873,14 @@ bool UnionDiscriminatorShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -4913,18 +4913,18 @@ UnionDiscriminatorUShortPubSubType::~UnionDiscriminatorUShortPubSubType() bool UnionDiscriminatorUShortPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -4943,12 +4943,12 @@ bool UnionDiscriminatorUShortPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorUShortPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -4957,14 +4957,14 @@ bool UnionDiscriminatorUShortPubSubType::deserialize( UnionDiscriminatorUShort* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5009,8 +5009,8 @@ void UnionDiscriminatorUShortPubSubType::delete_data( } bool UnionDiscriminatorUShortPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5029,7 +5029,7 @@ bool UnionDiscriminatorUShortPubSubType::compute_key( bool UnionDiscriminatorUShortPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5053,14 +5053,14 @@ bool UnionDiscriminatorUShortPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5093,18 +5093,18 @@ UnionDiscriminatorLongPubSubType::~UnionDiscriminatorLongPubSubType() bool UnionDiscriminatorLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5123,12 +5123,12 @@ bool UnionDiscriminatorLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5137,14 +5137,14 @@ bool UnionDiscriminatorLongPubSubType::deserialize( UnionDiscriminatorLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5189,8 +5189,8 @@ void UnionDiscriminatorLongPubSubType::delete_data( } bool UnionDiscriminatorLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5209,7 +5209,7 @@ bool UnionDiscriminatorLongPubSubType::compute_key( bool UnionDiscriminatorLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5233,14 +5233,14 @@ bool UnionDiscriminatorLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5273,18 +5273,18 @@ UnionDiscriminatorULongPubSubType::~UnionDiscriminatorULongPubSubType() bool UnionDiscriminatorULongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5303,12 +5303,12 @@ bool UnionDiscriminatorULongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorULongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5317,14 +5317,14 @@ bool UnionDiscriminatorULongPubSubType::deserialize( UnionDiscriminatorULong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5369,8 +5369,8 @@ void UnionDiscriminatorULongPubSubType::delete_data( } bool UnionDiscriminatorULongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5389,7 +5389,7 @@ bool UnionDiscriminatorULongPubSubType::compute_key( bool UnionDiscriminatorULongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5413,14 +5413,14 @@ bool UnionDiscriminatorULongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5453,18 +5453,18 @@ UnionDiscriminatorLongLongPubSubType::~UnionDiscriminatorLongLongPubSubType() bool UnionDiscriminatorLongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5483,12 +5483,12 @@ bool UnionDiscriminatorLongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorLongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5497,14 +5497,14 @@ bool UnionDiscriminatorLongLongPubSubType::deserialize( UnionDiscriminatorLongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5549,8 +5549,8 @@ void UnionDiscriminatorLongLongPubSubType::delete_data( } bool UnionDiscriminatorLongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5569,7 +5569,7 @@ bool UnionDiscriminatorLongLongPubSubType::compute_key( bool UnionDiscriminatorLongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5593,14 +5593,14 @@ bool UnionDiscriminatorLongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5633,18 +5633,18 @@ UnionDiscriminatorULongLongPubSubType::~UnionDiscriminatorULongLongPubSubType() bool UnionDiscriminatorULongLongPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5663,12 +5663,12 @@ bool UnionDiscriminatorULongLongPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorULongLongPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5677,14 +5677,14 @@ bool UnionDiscriminatorULongLongPubSubType::deserialize( UnionDiscriminatorULongLong* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5729,8 +5729,8 @@ void UnionDiscriminatorULongLongPubSubType::delete_data( } bool UnionDiscriminatorULongLongPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5749,7 +5749,7 @@ bool UnionDiscriminatorULongLongPubSubType::compute_key( bool UnionDiscriminatorULongLongPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5773,14 +5773,14 @@ bool UnionDiscriminatorULongLongPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5813,18 +5813,18 @@ UnionDiscriminatorBooleanPubSubType::~UnionDiscriminatorBooleanPubSubType() bool UnionDiscriminatorBooleanPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -5843,12 +5843,12 @@ bool UnionDiscriminatorBooleanPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorBooleanPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -5857,14 +5857,14 @@ bool UnionDiscriminatorBooleanPubSubType::deserialize( UnionDiscriminatorBoolean* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -5909,8 +5909,8 @@ void UnionDiscriminatorBooleanPubSubType::delete_data( } bool UnionDiscriminatorBooleanPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5929,7 +5929,7 @@ bool UnionDiscriminatorBooleanPubSubType::compute_key( bool UnionDiscriminatorBooleanPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -5953,14 +5953,14 @@ bool UnionDiscriminatorBooleanPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -5993,18 +5993,18 @@ UnionDiscriminatorOctetPubSubType::~UnionDiscriminatorOctetPubSubType() bool UnionDiscriminatorOctetPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6023,12 +6023,12 @@ bool UnionDiscriminatorOctetPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorOctetPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6037,14 +6037,14 @@ bool UnionDiscriminatorOctetPubSubType::deserialize( UnionDiscriminatorOctet* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6089,8 +6089,8 @@ void UnionDiscriminatorOctetPubSubType::delete_data( } bool UnionDiscriminatorOctetPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6109,7 +6109,7 @@ bool UnionDiscriminatorOctetPubSubType::compute_key( bool UnionDiscriminatorOctetPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6133,14 +6133,14 @@ bool UnionDiscriminatorOctetPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6173,18 +6173,18 @@ UnionDiscriminatorCharPubSubType::~UnionDiscriminatorCharPubSubType() bool UnionDiscriminatorCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6203,12 +6203,12 @@ bool UnionDiscriminatorCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6217,14 +6217,14 @@ bool UnionDiscriminatorCharPubSubType::deserialize( UnionDiscriminatorChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6269,8 +6269,8 @@ void UnionDiscriminatorCharPubSubType::delete_data( } bool UnionDiscriminatorCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6289,7 +6289,7 @@ bool UnionDiscriminatorCharPubSubType::compute_key( bool UnionDiscriminatorCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6313,14 +6313,14 @@ bool UnionDiscriminatorCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6353,18 +6353,18 @@ UnionDiscriminatorWCharPubSubType::~UnionDiscriminatorWCharPubSubType() bool UnionDiscriminatorWCharPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6383,12 +6383,12 @@ bool UnionDiscriminatorWCharPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorWCharPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6397,14 +6397,14 @@ bool UnionDiscriminatorWCharPubSubType::deserialize( UnionDiscriminatorWChar* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6449,8 +6449,8 @@ void UnionDiscriminatorWCharPubSubType::delete_data( } bool UnionDiscriminatorWCharPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6469,7 +6469,7 @@ bool UnionDiscriminatorWCharPubSubType::compute_key( bool UnionDiscriminatorWCharPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6493,14 +6493,14 @@ bool UnionDiscriminatorWCharPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6533,18 +6533,18 @@ UnionDiscriminatorEnumPubSubType::~UnionDiscriminatorEnumPubSubType() bool UnionDiscriminatorEnumPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6563,12 +6563,12 @@ bool UnionDiscriminatorEnumPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorEnumPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6577,14 +6577,14 @@ bool UnionDiscriminatorEnumPubSubType::deserialize( UnionDiscriminatorEnum* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6629,8 +6629,8 @@ void UnionDiscriminatorEnumPubSubType::delete_data( } bool UnionDiscriminatorEnumPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6649,7 +6649,7 @@ bool UnionDiscriminatorEnumPubSubType::compute_key( bool UnionDiscriminatorEnumPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6673,14 +6673,14 @@ bool UnionDiscriminatorEnumPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6713,18 +6713,18 @@ UnionDiscriminatorEnumLabelPubSubType::~UnionDiscriminatorEnumLabelPubSubType() bool UnionDiscriminatorEnumLabelPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorEnumLabel* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6743,12 +6743,12 @@ bool UnionDiscriminatorEnumLabelPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorEnumLabelPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6757,14 +6757,14 @@ bool UnionDiscriminatorEnumLabelPubSubType::deserialize( UnionDiscriminatorEnumLabel* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6809,8 +6809,8 @@ void UnionDiscriminatorEnumLabelPubSubType::delete_data( } bool UnionDiscriminatorEnumLabelPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6829,7 +6829,7 @@ bool UnionDiscriminatorEnumLabelPubSubType::compute_key( bool UnionDiscriminatorEnumLabelPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -6853,14 +6853,14 @@ bool UnionDiscriminatorEnumLabelPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -6893,18 +6893,18 @@ UnionDiscriminatorAliasPubSubType::~UnionDiscriminatorAliasPubSubType() bool UnionDiscriminatorAliasPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionDiscriminatorAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -6923,12 +6923,12 @@ bool UnionDiscriminatorAliasPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionDiscriminatorAliasPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -6937,14 +6937,14 @@ bool UnionDiscriminatorAliasPubSubType::deserialize( UnionDiscriminatorAlias* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -6989,8 +6989,8 @@ void UnionDiscriminatorAliasPubSubType::delete_data( } bool UnionDiscriminatorAliasPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7009,7 +7009,7 @@ bool UnionDiscriminatorAliasPubSubType::compute_key( bool UnionDiscriminatorAliasPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7033,14 +7033,14 @@ bool UnionDiscriminatorAliasPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7073,18 +7073,18 @@ UnionSeveralFieldsPubSubType::~UnionSeveralFieldsPubSubType() bool UnionSeveralFieldsPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionSeveralFields* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7103,12 +7103,12 @@ bool UnionSeveralFieldsPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionSeveralFieldsPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7117,14 +7117,14 @@ bool UnionSeveralFieldsPubSubType::deserialize( UnionSeveralFields* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7169,8 +7169,8 @@ void UnionSeveralFieldsPubSubType::delete_data( } bool UnionSeveralFieldsPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7189,7 +7189,7 @@ bool UnionSeveralFieldsPubSubType::compute_key( bool UnionSeveralFieldsPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7213,14 +7213,14 @@ bool UnionSeveralFieldsPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -7253,18 +7253,18 @@ UnionSeveralFieldsWithDefaultPubSubType::~UnionSeveralFieldsWithDefaultPubSubTyp bool UnionSeveralFieldsWithDefaultPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionSeveralFieldsWithDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -7283,12 +7283,12 @@ bool UnionSeveralFieldsWithDefaultPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionSeveralFieldsWithDefaultPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -7297,14 +7297,14 @@ bool UnionSeveralFieldsWithDefaultPubSubType::deserialize( UnionSeveralFieldsWithDefault* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -7349,8 +7349,8 @@ void UnionSeveralFieldsWithDefaultPubSubType::delete_data( } bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7369,7 +7369,7 @@ bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -7393,14 +7393,14 @@ bool UnionSeveralFieldsWithDefaultPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index b1f11519326..a244eac9c6d 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -55,11 +55,11 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -67,13 +67,13 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -134,11 +134,11 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -146,13 +146,13 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -213,11 +213,11 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -225,13 +225,13 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -292,11 +292,11 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -304,13 +304,13 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -371,11 +371,11 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -383,13 +383,13 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -450,11 +450,11 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -462,13 +462,13 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -529,11 +529,11 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -541,13 +541,13 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -608,11 +608,11 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -620,13 +620,13 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -687,11 +687,11 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -699,13 +699,13 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -766,11 +766,11 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -778,13 +778,13 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -845,11 +845,11 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -857,13 +857,13 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -924,11 +924,11 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -936,13 +936,13 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1003,11 +1003,11 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1015,13 +1015,13 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1082,11 +1082,11 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1094,13 +1094,13 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1161,11 +1161,11 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1173,13 +1173,13 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1240,11 +1240,11 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1252,13 +1252,13 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1319,11 +1319,11 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1331,13 +1331,13 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1398,11 +1398,11 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1410,13 +1410,13 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1477,11 +1477,11 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1489,13 +1489,13 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1556,11 +1556,11 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1568,13 +1568,13 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1635,11 +1635,11 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1647,13 +1647,13 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1714,11 +1714,11 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1726,13 +1726,13 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1793,11 +1793,11 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1805,13 +1805,13 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1872,11 +1872,11 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1884,13 +1884,13 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -1951,11 +1951,11 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -1963,13 +1963,13 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2030,11 +2030,11 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2042,13 +2042,13 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2109,11 +2109,11 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2121,13 +2121,13 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2188,11 +2188,11 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2200,13 +2200,13 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2267,11 +2267,11 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2279,13 +2279,13 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2346,11 +2346,11 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2358,13 +2358,13 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2425,11 +2425,11 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2437,13 +2437,13 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2504,11 +2504,11 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2516,13 +2516,13 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2583,11 +2583,11 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2595,13 +2595,13 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2662,11 +2662,11 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2674,13 +2674,13 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2741,11 +2741,11 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2753,13 +2753,13 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2820,11 +2820,11 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2832,13 +2832,13 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2899,11 +2899,11 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2911,13 +2911,13 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -2978,11 +2978,11 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -2990,13 +2990,13 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3057,11 +3057,11 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3069,13 +3069,13 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3136,11 +3136,11 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3148,13 +3148,13 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -3215,11 +3215,11 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -3227,13 +3227,13 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp index edd9c7ce538..619012777c2 100644 --- a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp +++ b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp @@ -116,23 +116,23 @@ class DynamicTypesDDSTypesTest : public ::testing::Test // Dynamic Serialization <-> Dynamic Deserialization eprosima::fastdds::rtps::SerializedPayload_t dyn_payload(dyn_payloadSize); - ASSERT_TRUE(dyn_pubsubType.serialize(&data, &dyn_payload, data_representation)); + ASSERT_TRUE(dyn_pubsubType.serialize(&data, dyn_payload, data_representation)); DynamicData::_ref_type data1 {DynamicDataFactory::get_instance()->create_data(type)}; - ASSERT_TRUE(dyn_pubsubType.deserialize(&dyn_payload, &data1)); + ASSERT_TRUE(dyn_pubsubType.deserialize(dyn_payload, &data1)); EXPECT_TRUE(data1->equals(data)); // Dynamic Serialization <-> Static Deserialization - ASSERT_TRUE(static_pubsubType.deserialize(&dyn_payload, &data_static)); + ASSERT_TRUE(static_pubsubType.deserialize(dyn_payload, &data_static)); // Static Serialization <-> Dynamic Deserialization uint32_t static_payloadSize = static_pubsubType.calculate_serialized_size(&data_static, data_representation); EXPECT_EQ(static_payloadSize, dyn_payloadSize); eprosima::fastdds::rtps::SerializedPayload_t static_payload(static_payloadSize); - ASSERT_TRUE(static_pubsubType.serialize(&data_static, &static_payload, data_representation)); + ASSERT_TRUE(static_pubsubType.serialize(&data_static, static_payload, data_representation)); EXPECT_EQ(static_payload.length, static_payloadSize); DynamicData::_ref_type data2 {DynamicDataFactory::get_instance()->create_data(type)}; - ASSERT_TRUE(dyn_pubsubType.deserialize(&static_payload, &data2)); + ASSERT_TRUE(dyn_pubsubType.deserialize(static_payload, &data2)); EXPECT_TRUE(data2->equals(data)); EXPECT_EQ(DynamicDataFactory::get_instance()->delete_data(data1), RETCODE_OK); diff --git a/test/feature/dynamic_types/DynamicTypesTests.cpp b/test/feature/dynamic_types/DynamicTypesTests.cpp index 9db870e8602..95400ac3c0a 100644 --- a/test/feature/dynamic_types/DynamicTypesTests.cpp +++ b/test/feature/dynamic_types/DynamicTypesTests.cpp @@ -47,10 +47,10 @@ void encoding_decoding_test( uint32_t payloadSize = static_cast(pubsubType.calculate_serialized_size(&encoding_data, encoding)); SerializedPayload_t payload(payloadSize); - EXPECT_TRUE(pubsubType.serialize(&encoding_data, &payload, encoding)); + EXPECT_TRUE(pubsubType.serialize(&encoding_data, payload, encoding)); EXPECT_EQ(payload.length, payloadSize); EXPECT_LE(payload.length, pubsubType->max_serialized_type_size); - EXPECT_TRUE(pubsubType.deserialize(&payload, &decoding_data)); + EXPECT_TRUE(pubsubType.deserialize(payload, &decoding_data)); EXPECT_TRUE(decoding_data->equals(encoding_data)); DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( @@ -12733,7 +12733,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_1) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, instance_handle)); const uint8_t expected_key_hash[] { 0x12, 0x34, 0x56, 0x78, @@ -12803,7 +12803,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_2) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, instance_handle)); const uint8_t expected_key_hash[] { 0xf9, 0x1a, 0x59, 0xe3, @@ -12910,7 +12910,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_3) TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; eprosima::fastdds::rtps::InstanceHandle_t instance_handle; - ASSERT_TRUE(pubsubType.compute_key(&data, &instance_handle)); + ASSERT_TRUE(pubsubType.compute_key(&data, instance_handle)); const uint8_t expected_key_hash[] { 0x37, 0x4b, 0x96, 0xe2, diff --git a/test/performance/latency/LatencyTestTypes.cpp b/test/performance/latency/LatencyTestTypes.cpp index 68276ac8dcf..d863f621c50 100644 --- a/test/performance/latency/LatencyTestTypes.cpp +++ b/test/performance/latency/LatencyTestTypes.cpp @@ -55,13 +55,13 @@ void LatencyDataType::copy_data( bool LatencyDataType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t) { static uint8_t encapsulation[4] = { 0x0, 0x1, 0x0, 0x0 }; LatencyType* lt = (LatencyType*)data; - auto ser_data = payload->data; + auto ser_data = payload.data; memcpy(ser_data, encapsulation, SerializedPayload_t::representation_header_size); ser_data += SerializedPayload_t::representation_header_size; memcpy(ser_data, <->seqnum, sizeof(lt->seqnum)); @@ -69,17 +69,17 @@ bool LatencyDataType::serialize( memcpy(ser_data, <->bounce, sizeof(lt->bounce)); ser_data += sizeof(lt->bounce); memcpy(ser_data, lt->data, buffer_size_); - payload->length = max_serialized_type_size; + payload.length = max_serialized_type_size; return true; } bool LatencyDataType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { // Payload members endianness matches local machine LatencyType* lt = (LatencyType*)data; - auto ser_data = payload->data + SerializedPayload_t::representation_header_size; + auto ser_data = payload.data + SerializedPayload_t::representation_header_size; lt->seqnum = *reinterpret_cast(ser_data); ser_data += sizeof(lt->seqnum); lt->bounce = *reinterpret_cast(ser_data); @@ -108,23 +108,23 @@ void LatencyDataType::delete_data( bool TestCommandDataType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t) { TestCommandType* t = (TestCommandType*)data; - memcpy(payload->data, &t->m_command, sizeof(t->m_command)); - payload->length = 4; + memcpy(payload.data, &t->m_command, sizeof(t->m_command)); + payload.length = 4; return true; } bool TestCommandDataType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { TestCommandType* t = (TestCommandType*)data; // cout << "PAYLOAD LENGTH: "<length << endl; // cout << "PAYLOAD FIRST BYTE: "<< (int)payload->data[0] << endl; - memcpy(&t->m_command, payload->data, sizeof(payload->length)); + memcpy(&t->m_command, payload.data, sizeof(payload.length)); // cout << "COMMAND: "<m_command<< endl; return true; } diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index f95b66e2d11..24ab0f406dc 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -106,10 +106,10 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( @@ -120,8 +120,8 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -130,7 +130,7 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -208,10 +208,10 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( @@ -222,8 +222,8 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -232,7 +232,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/performance/throughput/ThroughputTypes.cpp b/test/performance/throughput/ThroughputTypes.cpp index 73614f63b46..c5f1eedfa8c 100644 --- a/test/performance/throughput/ThroughputTypes.cpp +++ b/test/performance/throughput/ThroughputTypes.cpp @@ -43,31 +43,31 @@ bool ThroughputDataType::compare_data( // Serialization and deserialization functions bool ThroughputDataType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t) { static uint8_t encapsulation[4] = { 0x0, 0x1, 0x0, 0x0 }; ThroughputType* lt = (ThroughputType*)data; - auto ser_data = payload->data; + auto ser_data = payload.data; memcpy(ser_data, encapsulation, SerializedPayload_t::representation_header_size); ser_data += SerializedPayload_t::representation_header_size; memcpy(ser_data, <->seqnum, sizeof(lt->seqnum)); ser_data += sizeof(lt->seqnum); memcpy(ser_data, lt->data, buffer_size_); - payload->length = max_serialized_type_size; + payload.length = max_serialized_type_size; return true; } bool ThroughputDataType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { - if (payload->length > 0) + if (payload.length > 0) { // payload members endiannes matches local machine ThroughputType* lt = (ThroughputType*)data; - auto ser_data = payload->data + SerializedPayload_t::representation_header_size; + auto ser_data = payload.data + SerializedPayload_t::representation_header_size; lt->seqnum = *reinterpret_cast(ser_data); ser_data += sizeof(lt->seqnum); std::copy(ser_data, ser_data + buffer_size_, lt->data); @@ -96,51 +96,51 @@ void ThroughputDataType::delete_data( bool ThroughputCommandDataType::serialize( const void* const data, - SerializedPayload_t* p, + SerializedPayload_t& p, eprosima::fastdds::dds::DataRepresentationId_t) { ThroughputCommandType* t = (ThroughputCommandType*)data; - p->length = 0; + p.length = 0; const uint32_t command = t->m_command; - memcpy(p->data, &command, sizeof(command)); - p->length += sizeof(command); - memcpy(&p->data[p->length], &t->m_size, sizeof(t->m_size)); - p->length += sizeof(t->m_size); - memcpy(&p->data[p->length], &t->m_demand, sizeof(t->m_demand)); - p->length += sizeof(t->m_demand); - memcpy(&p->data[p->length], &t->m_lostsamples, sizeof(t->m_lostsamples)); - p->length += sizeof(t->m_lostsamples); - memcpy(&p->data[p->length], &t->m_receivedsamples, sizeof(t->m_receivedsamples)); - p->length += sizeof(t->m_receivedsamples); - memcpy(&p->data[p->length], &t->m_lastrecsample, sizeof(t->m_lastrecsample)); - p->length += sizeof(t->m_lastrecsample); - memcpy(&p->data[p->length], &t->m_totaltime, sizeof(t->m_totaltime)); - p->length += sizeof(t->m_totaltime); + memcpy(p.data, &command, sizeof(command)); + p.length += sizeof(command); + memcpy(&p.data[p.length], &t->m_size, sizeof(t->m_size)); + p.length += sizeof(t->m_size); + memcpy(&p.data[p.length], &t->m_demand, sizeof(t->m_demand)); + p.length += sizeof(t->m_demand); + memcpy(&p.data[p.length], &t->m_lostsamples, sizeof(t->m_lostsamples)); + p.length += sizeof(t->m_lostsamples); + memcpy(&p.data[p.length], &t->m_receivedsamples, sizeof(t->m_receivedsamples)); + p.length += sizeof(t->m_receivedsamples); + memcpy(&p.data[p.length], &t->m_lastrecsample, sizeof(t->m_lastrecsample)); + p.length += sizeof(t->m_lastrecsample); + memcpy(&p.data[p.length], &t->m_totaltime, sizeof(t->m_totaltime)); + p.length += sizeof(t->m_totaltime); return true; } bool ThroughputCommandDataType::deserialize( - SerializedPayload_t* p, + SerializedPayload_t& p, void* data) { ThroughputCommandType* t = (ThroughputCommandType*)data; - p->pos = 0; + p.pos = 0; uint32_t command; - memcpy(&command, p->data, sizeof(command)); + memcpy(&command, p.data, sizeof(command)); t->m_command = static_cast(command); - p->pos += sizeof(command); - memcpy(&t->m_size, &p->data[p->pos], sizeof(t->m_size)); - p->pos += sizeof(t->m_size); - memcpy(&t->m_demand, &p->data[p->pos], sizeof(t->m_demand)); - p->pos += sizeof(t->m_demand); - memcpy(&t->m_lostsamples, &p->data[p->pos], sizeof(t->m_lostsamples)); - p->pos += sizeof(t->m_lostsamples); - memcpy(&t->m_receivedsamples, &p->data[p->pos], sizeof(t->m_receivedsamples)); - p->pos += sizeof(t->m_receivedsamples); - memcpy(&t->m_lastrecsample, &p->data[p->pos], sizeof(t->m_lastrecsample)); - p->pos += sizeof(t->m_lastrecsample); - memcpy(&t->m_totaltime, &p->data[p->pos], sizeof(t->m_totaltime)); - p->pos += sizeof(t->m_totaltime); + p.pos += sizeof(command); + memcpy(&t->m_size, &p.data[p.pos], sizeof(t->m_size)); + p.pos += sizeof(t->m_size); + memcpy(&t->m_demand, &p.data[p.pos], sizeof(t->m_demand)); + p.pos += sizeof(t->m_demand); + memcpy(&t->m_lostsamples, &p.data[p.pos], sizeof(t->m_lostsamples)); + p.pos += sizeof(t->m_lostsamples); + memcpy(&t->m_receivedsamples, &p.data[p.pos], sizeof(t->m_receivedsamples)); + p.pos += sizeof(t->m_receivedsamples); + memcpy(&t->m_lastrecsample, &p.data[p.pos], sizeof(t->m_lastrecsample)); + p.pos += sizeof(t->m_lastrecsample); + memcpy(&t->m_totaltime, &p.data[p.pos], sizeof(t->m_totaltime)); + p.pos += sizeof(t->m_totaltime); return true; } diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index 86499fbdf2f..89855c09d5c 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -138,11 +138,11 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( @@ -155,8 +155,8 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -165,7 +165,7 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -264,11 +264,11 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( @@ -281,8 +281,8 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -291,7 +291,7 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/profiling/MemoryTestTypes.cpp b/test/profiling/MemoryTestTypes.cpp index f5ef4bc8786..d2045327260 100644 --- a/test/profiling/MemoryTestTypes.cpp +++ b/test/profiling/MemoryTestTypes.cpp @@ -24,28 +24,28 @@ using namespace eprosima::fastdds::rtps; bool MemoryDataType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t) { const MemoryType* lt = static_cast(data); - *(uint32_t*)payload->data = lt->seqnum; - *(uint32_t*)(payload->data + 4) = (uint32_t)lt->data.size(); + *(uint32_t*)payload.data = lt->seqnum; + *(uint32_t*)(payload.data + 4) = (uint32_t)lt->data.size(); - memcpy(payload->data + 8, lt->data.data(), lt->data.size()); - payload->length = static_cast(8 + lt->data.size()); + memcpy(payload.data + 8, lt->data.data(), lt->data.size()); + payload.length = static_cast(8 + lt->data.size()); return true; } bool MemoryDataType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { MemoryType* lt = static_cast(data); - lt->seqnum = static_cast(*(payload->data)); - uint32_t siz = static_cast(*(payload->data + 4)); - std::copy(payload->data + 8, payload->data + 8 + siz, lt->data.begin()); + lt->seqnum = static_cast(*(payload.data)); + uint32_t siz = static_cast(*(payload.data + 4)); + std::copy(payload.data + 8, payload.data + 8 + siz, lt->data.begin()); return true; } @@ -76,21 +76,21 @@ void MemoryDataType::delete_data( bool TestCommandDataType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t) { const TestCommandType* t = static_cast(data); - *(TESTCOMMAND*)payload->data = t->m_command; - payload->length = 4; + *(TESTCOMMAND*)payload.data = t->m_command; + payload.length = 4; return true; } bool TestCommandDataType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { TestCommandType* t = static_cast(data); - t->m_command = static_cast(*(payload->data)); + t->m_command = static_cast(*(payload.data)); return true; } diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index 17c8555f938..f0dc597b6c3 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -91,10 +91,10 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( const void* const data, @@ -103,8 +103,8 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType void delete_data( void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -113,7 +113,7 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -164,10 +164,10 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; uint32_t calculate_serialized_size( const void* const data, @@ -177,8 +177,8 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -187,7 +187,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx index 0a919426c11..098f48976f2 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx @@ -53,18 +53,18 @@ AllocTestTypePubSubType::~AllocTestTypePubSubType() bool AllocTestTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AllocTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool AllocTestTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AllocTestTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool AllocTestTypePubSubType::deserialize( AllocTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void AllocTestTypePubSubType::delete_data( } bool AllocTestTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool AllocTestTypePubSubType::compute_key( bool AllocTestTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool AllocTestTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index 0416e1a5572..640bffeb965 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -54,11 +54,11 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index 89a38c57136..e35f445c092 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -98,14 +98,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -129,8 +129,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -138,7 +138,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -164,14 +164,14 @@ class LoanableTopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -206,8 +206,8 @@ class LoanableTopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -215,7 +215,7 @@ class LoanableTopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -3274,7 +3274,7 @@ TEST(ParticipantTests, DeleteContainedEntities) InstanceHandle_t handle_nil = HANDLE_NIL; BarType data; data.index(1); - type.compute_key(&data, &handle_nil); + type.compute_key(&data, handle_nil); TypeSupport loanable_type(new LoanableTopicDataTypeMock()); loanable_type.register_type(participant); diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index 518fa524353..b03c678d68e 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -95,14 +95,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -126,8 +126,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -135,7 +135,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -192,14 +192,14 @@ class InstanceTopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -223,8 +223,8 @@ class InstanceTopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -232,10 +232,10 @@ class InstanceTopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* ihandle, + fastdds::rtps::InstanceHandle_t& ihandle, bool /*force_md5*/) override { - ihandle->value[0] = 1; + ihandle.value[0] = 1; return true; } @@ -256,14 +256,14 @@ class BoundedTopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -287,8 +287,8 @@ class BoundedTopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -296,7 +296,7 @@ class BoundedTopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -1046,7 +1046,7 @@ TEST(DataWriterTests, UnregisterInstance) // 7. Calling unregister_instance with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write(&data, HANDLE_NIL)); - instance_type->compute_key(&data, &handle); + instance_type->compute_key(&data, handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->unregister_instance(&data, handle)); // TODO(jlbueno) There are other possible errors sending the unregister message: RETCODE_OUT_OF_RESOURCES, @@ -1101,7 +1101,7 @@ TEST(DataWriterTests, UnregisterInstanceWithTimestamp) // 7. Calling unregister_instance with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - instance_type.compute_key(&data, &handle); + instance_type.compute_key(&data, handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->unregister_instance_w_timestamp(&data, handle, ts)); // 8. Check invalid timestamps @@ -1160,7 +1160,7 @@ TEST(DataWriterTests, Dispose) // 7. Calling dispose with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write(&data, HANDLE_NIL)); - instance_type.compute_key(&data, &handle); + instance_type.compute_key(&data, handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->dispose(&data, handle)); // TODO(jlbueno) There are other possible errors sending the dispose message: RETCODE_OUT_OF_RESOURCES, @@ -1212,7 +1212,7 @@ TEST(DataWriterTests, DisposeWithTimestamp) // 7. Calling dispose with a valid InstanceHandle also returns RETCODE_OK data.message("HelloWorld_1"); ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - instance_type.compute_key(&data, &handle); + instance_type.compute_key(&data, handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->dispose_w_timestamp(&data, handle, ts)); // 8. Check invalid timestamps @@ -1306,14 +1306,14 @@ class LoanableTypeSupport : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -1337,8 +1337,8 @@ class LoanableTypeSupport : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -1346,7 +1346,7 @@ class LoanableTypeSupport : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -1641,7 +1641,7 @@ TEST(DataWriterTests, InstanceWaitForAcknowledgement) // Expectations EXPECT_CALL(*history, wait_for_acknowledgement_last_change(_, _, _)).WillOnce(testing::Return(true)); - instance_type.compute_key(&data, &handle); + instance_type.compute_key(&data, handle); EXPECT_EQ(RETCODE_OK, instance_datawriter->wait_for_acknowledgments(&data, handle, max_wait)); // 7. Calling wait_for_acknowledgments in a keyed topic with a known handle timeouts if some reader has not diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index feccf735246..1f652654a17 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -46,14 +46,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -77,8 +77,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -86,7 +86,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -107,14 +107,14 @@ class LoanableTopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -149,8 +149,8 @@ class LoanableTopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -158,7 +158,7 @@ class LoanableTopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index c1e56121fc1..6449364cdac 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -497,14 +497,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -528,8 +528,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -537,7 +537,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 0976dcafd86..7bb3cfa61c5 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -19,12 +19,12 @@ class TestType : public TopicDataType MOCK_METHOD(bool, serialize, ( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation), (override)); MOCK_METHOD(bool, deserialize, ( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data), (override)); @@ -39,14 +39,14 @@ class TestType : public TopicDataType (override)); MOCK_METHOD(bool, compute_key, ( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::dds::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::InstanceHandle_t& ihandle, bool), (override)); MOCK_METHOD(bool, compute_key, ( const void* const data, - eprosima::fastdds::dds::InstanceHandle_t* ihandle, + eprosima::fastdds::dds::InstanceHandle_t& ihandle, bool), (override)); }; diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index 96586e8fd10..c1c2e9da827 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -171,10 +171,10 @@ class DataReaderTests : public ::testing::Test FooType data; data.index(0); - type_.compute_key(&data, &handle_ok_); + type_.compute_key(&data, handle_ok_); data.index(2); - type_.compute_key(&data, &handle_wrong_); + type_.compute_key(&data, handle_wrong_); } void reset_lengths_if_ok( @@ -1798,8 +1798,8 @@ TEST_F(DataReaderTests, sample_info) data_[0].index(1); data_[1].index(2); - type.compute_key(&data_[0], &handles_[0]); - type.compute_key(&data_[1], &handles_[1]); + type.compute_key(&data_[0], handles_[0]); + type.compute_key(&data_[1], handles_[1]); } ~TestState() @@ -2103,7 +2103,7 @@ TEST_F(DataReaderTests, check_read_take_iteration) { // calculate key data.index(i); - type_.compute_key(&data, &handles[i]); + type_.compute_key(&data, handles[i]); // write the index as message oarraystream out(data.message()); @@ -2229,7 +2229,7 @@ class FailingFooTypeSupport : public FooTypeSupport } bool deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) override { //Convert DATA to pointer of your type @@ -3770,14 +3770,14 @@ class DataRepresentationTestsTypeSupport : public TopicDataType bool serialize( const void* const /*data*/, - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -3801,8 +3801,8 @@ class DataRepresentationTestsTypeSupport : public TopicDataType } bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -3810,7 +3810,7 @@ class DataRepresentationTestsTypeSupport : public TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index 963b3593e76..67de52cd9e7 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -41,18 +41,18 @@ class FooBoundedTypeSupport : public TopicDataType bool serialize( const void* const data, - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation) override { const type* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fb, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? @@ -74,23 +74,19 @@ class FooBoundedTypeSupport : public TopicDataType } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else - payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, void* data) override { //Convert DATA to pointer of your type type* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fb @@ -102,7 +98,7 @@ class FooBoundedTypeSupport : public TopicDataType // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; try { @@ -138,8 +134,8 @@ class FooBoundedTypeSupport : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*handle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*handle*/, bool /*force_md5*/) override { return false; @@ -147,7 +143,7 @@ class FooBoundedTypeSupport : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*handle*/, + fastdds::rtps::InstanceHandle_t& /*handle*/, bool /*force_md5*/) override { return false; diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index 03bc31cf448..d7c401db323 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -39,18 +39,18 @@ class FooTypeSupport : public TopicDataType bool serialize( const void* const data, - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, DataRepresentationId_t data_representation) override { const FooType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fb, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; #if FASTCDR_VERSION_MAJOR > 1 ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? @@ -72,23 +72,19 @@ class FooTypeSupport : public TopicDataType } // Get the serialized length -#if FASTCDR_VERSION_MAJOR == 1 - payload->length = static_cast(ser.getSerializedDataLength()); -#else - payload->length = static_cast(ser.get_serialized_data_length()); -#endif // FASTCDR_VERSION_MAJOR == 1 + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t& payload, void* data) override { //Convert DATA to pointer of your type FooType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fb(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fb @@ -100,7 +96,7 @@ class FooTypeSupport : public TopicDataType // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; try { @@ -135,8 +131,8 @@ class FooTypeSupport : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* payload, - fastdds::rtps::InstanceHandle_t* handle, + fastdds::rtps::SerializedPayload_t& payload, + fastdds::rtps::InstanceHandle_t& handle, bool force_md5) override { FooType data; @@ -150,7 +146,7 @@ class FooTypeSupport : public TopicDataType bool compute_key( const void* const data, - fastdds::rtps::InstanceHandle_t* handle, + fastdds::rtps::InstanceHandle_t& handle, bool force_md5) override { const FooType* p_type = static_cast(data); @@ -174,14 +170,14 @@ class FooTypeSupport : public TopicDataType md5.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5.digest[i]; + handle.value[i] = md5.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buf[i]; + handle.value[i] = key_buf[i]; } } return true; diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp index e2dd81576cf..90e37a3fd00 100644 --- a/test/unittest/dds/subscriber/SubscriberTests.cpp +++ b/test/unittest/dds/subscriber/SubscriberTests.cpp @@ -155,14 +155,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -186,8 +186,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -195,7 +195,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -818,7 +818,7 @@ TEST(SubscriberTests, DeleteContainedEntities) InstanceHandle_t handle_nil = HANDLE_NIL; BarType data; data.index(1); - type.compute_key(&data, &handle_nil); + type.compute_key(&data, handle_nil); EXPECT_EQ(RETCODE_OK, data_writer_foo->write(&data, HANDLE_NIL)); // Wait for data to arrive and check OK should be returned diff --git a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp index 3c72639d524..8ce141db95b 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp +++ b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp @@ -682,7 +682,7 @@ class DDSSQLFilterValueGlobalData auto data_size = type_support.calculate_serialized_size(data_ptr, fastdds::dds::DEFAULT_DATA_REPRESENTATION); auto payload = new IContentFilter::SerializedPayload(data_size); values_.emplace_back(payload); - type_support.serialize(data_ptr, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); + type_support.serialize(data_ptr, *payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); } void add_char_values( diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx index ed563a03187..99da02c4b96 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx @@ -53,18 +53,18 @@ StructTypePubSubType::~StructTypePubSubType() bool StructTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool StructTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool StructTypePubSubType::deserialize( StructType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void StructTypePubSubType::delete_data( } bool StructTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool StructTypePubSubType::compute_key( bool StructTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool StructTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -235,18 +235,18 @@ ContentFilterTestTypePubSubType::~ContentFilterTestTypePubSubType() bool ContentFilterTestTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ContentFilterTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -265,12 +265,12 @@ bool ContentFilterTestTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ContentFilterTestTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -279,14 +279,14 @@ bool ContentFilterTestTypePubSubType::deserialize( ContentFilterTestType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -331,8 +331,8 @@ void ContentFilterTestTypePubSubType::delete_data( } bool ContentFilterTestTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -351,7 +351,7 @@ bool ContentFilterTestTypePubSubType::compute_key( bool ContentFilterTestTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -375,14 +375,14 @@ bool ContentFilterTestTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index 12e6b56fdfd..f17e9dc8c7d 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -54,11 +54,11 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -135,11 +135,11 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -147,13 +147,13 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index 1de63e9feb4..670d248495a 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -74,14 +74,14 @@ class TopicDataTypeMock : public TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -105,8 +105,8 @@ class TopicDataTypeMock : public TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -114,7 +114,7 @@ class TopicDataTypeMock : public TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx index 5093f253fd8..7efe9e43918 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.cxx @@ -53,18 +53,18 @@ AliasStructPubSubType::~AliasStructPubSubType() bool AliasStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool AliasStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AliasStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool AliasStructPubSubType::deserialize( AliasStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void AliasStructPubSubType::delete_data( } bool AliasStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool AliasStructPubSubType::compute_key( bool AliasStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool AliasStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp index f5f946356d1..02f9a18f0be 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp @@ -59,11 +59,11 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -71,13 +71,13 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx index 8f6ee392146..f4e934c5692 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.cxx @@ -53,18 +53,18 @@ NestedArrayElementPubSubType::~NestedArrayElementPubSubType() bool NestedArrayElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const NestedArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool NestedArrayElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool NestedArrayElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool NestedArrayElementPubSubType::deserialize( NestedArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void NestedArrayElementPubSubType::delete_data( } bool NestedArrayElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool NestedArrayElementPubSubType::compute_key( bool NestedArrayElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool NestedArrayElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ComplexArrayElementPubSubType::~ComplexArrayElementPubSubType() bool ComplexArrayElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ComplexArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ComplexArrayElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ComplexArrayElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ComplexArrayElementPubSubType::deserialize( ComplexArrayElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ComplexArrayElementPubSubType::delete_data( } bool ComplexArrayElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ComplexArrayElementPubSubType::compute_key( bool ComplexArrayElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ComplexArrayElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ ArrayStructPubSubType::~ArrayStructPubSubType() bool ArrayStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ArrayStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool ArrayStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ArrayStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool ArrayStructPubSubType::deserialize( ArrayStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void ArrayStructPubSubType::delete_data( } bool ArrayStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool ArrayStructPubSubType::compute_key( bool ArrayStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool ArrayStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp index 9397608fc4b..5ff71513879 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx index 32167de6781..550e833dd9b 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.cxx @@ -53,18 +53,18 @@ BitmaskStructPubSubType::~BitmaskStructPubSubType() bool BitmaskStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BitmaskStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool BitmaskStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BitmaskStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool BitmaskStructPubSubType::deserialize( BitmaskStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void BitmaskStructPubSubType::delete_data( } bool BitmaskStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool BitmaskStructPubSubType::compute_key( bool BitmaskStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool BitmaskStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp index 33c1e246a47..28fb3956e0c 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx index 6d2156195ce..87fc04b94c9 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.cxx @@ -53,18 +53,18 @@ BitsetStructPubSubType::~BitsetStructPubSubType() bool BitsetStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool BitsetStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool BitsetStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool BitsetStructPubSubType::deserialize( BitsetStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void BitsetStructPubSubType::delete_data( } bool BitsetStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool BitsetStructPubSubType::compute_key( bool BitsetStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool BitsetStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp index 3aa7ddfdecc..026cc4a8cd7 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx index a8ca8ab7bce..5650af14317 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.cxx @@ -53,18 +53,18 @@ EnumStructPubSubType::~EnumStructPubSubType() bool EnumStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const EnumStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool EnumStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool EnumStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool EnumStructPubSubType::deserialize( EnumStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void EnumStructPubSubType::delete_data( } bool EnumStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool EnumStructPubSubType::compute_key( bool EnumStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool EnumStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp index 66bd6bea195..230526e3af6 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx index 250dc010571..da3e73436c0 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.cxx @@ -53,18 +53,18 @@ FinalStructPubSubType::~FinalStructPubSubType() bool FinalStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const FinalStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool FinalStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool FinalStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool FinalStructPubSubType::deserialize( FinalStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void FinalStructPubSubType::delete_data( } bool FinalStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool FinalStructPubSubType::compute_key( bool FinalStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool FinalStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ MutableStructPubSubType::~MutableStructPubSubType() bool MutableStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MutableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR : @@ -263,12 +263,12 @@ bool MutableStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MutableStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool MutableStructPubSubType::deserialize( MutableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void MutableStructPubSubType::delete_data( } bool MutableStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool MutableStructPubSubType::compute_key( bool MutableStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool MutableStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ AppendableStructPubSubType::~AppendableStructPubSubType() bool AppendableStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AppendableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool AppendableStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AppendableStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool AppendableStructPubSubType::deserialize( AppendableStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void AppendableStructPubSubType::delete_data( } bool AppendableStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool AppendableStructPubSubType::compute_key( bool AppendableStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool AppendableStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ ExtensibilityStructPubSubType::~ExtensibilityStructPubSubType() bool ExtensibilityStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ExtensibilityStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool ExtensibilityStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ExtensibilityStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool ExtensibilityStructPubSubType::deserialize( ExtensibilityStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void ExtensibilityStructPubSubType::delete_data( } bool ExtensibilityStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool ExtensibilityStructPubSubType::compute_key( bool ExtensibilityStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool ExtensibilityStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp index 0acf7fdb93c..a89f7f7be05 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp @@ -87,11 +87,11 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -99,13 +99,13 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -188,11 +188,11 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -200,13 +200,13 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -267,11 +267,11 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -279,13 +279,13 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -346,11 +346,11 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -358,13 +358,13 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx index 6250ac91171..9a122e68649 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.cxx @@ -53,18 +53,18 @@ ImportantStructPubSubType::~ImportantStructPubSubType() bool ImportantStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ImportantStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool ImportantStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ImportantStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool ImportantStructPubSubType::deserialize( ImportantStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void ImportantStructPubSubType::delete_data( } bool ImportantStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool ImportantStructPubSubType::compute_key( bool ImportantStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool ImportantStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ KeyStructPubSubType::~KeyStructPubSubType() bool KeyStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const KeyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool KeyStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool KeyStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool KeyStructPubSubType::deserialize( KeyStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void KeyStructPubSubType::delete_data( } bool KeyStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool KeyStructPubSubType::compute_key( bool KeyStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool KeyStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp index f25e64d92e3..54c88de0b91 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx index 6349d35495e..45faab89249 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.cxx @@ -53,18 +53,18 @@ ValueStructPubSubType::~ValueStructPubSubType() bool ValueStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ValueStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool ValueStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ValueStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool ValueStructPubSubType::deserialize( ValueStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void ValueStructPubSubType::delete_data( } bool ValueStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool ValueStructPubSubType::compute_key( bool ValueStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool ValueStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ MapStructPubSubType::~MapStructPubSubType() bool MapStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const MapStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool MapStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool MapStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool MapStructPubSubType::deserialize( MapStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void MapStructPubSubType::delete_data( } bool MapStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool MapStructPubSubType::compute_key( bool MapStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool MapStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp index 9f83a37ec08..5f17e6aa287 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx index 0f5af696c22..5974d5412cb 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.cxx @@ -53,18 +53,18 @@ PrimitivesStructPubSubType::~PrimitivesStructPubSubType() bool PrimitivesStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool PrimitivesStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PrimitivesStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool PrimitivesStructPubSubType::deserialize( PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void PrimitivesStructPubSubType::delete_data( } bool PrimitivesStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool PrimitivesStructPubSubType::compute_key( bool PrimitivesStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool PrimitivesStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp index dc813132db2..ab3fa2fb39a 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx index 030fb441170..d18b62727ca 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.cxx @@ -53,18 +53,18 @@ NestedSequenceElementPubSubType::~NestedSequenceElementPubSubType() bool NestedSequenceElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const NestedSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool NestedSequenceElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool NestedSequenceElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool NestedSequenceElementPubSubType::deserialize( NestedSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void NestedSequenceElementPubSubType::delete_data( } bool NestedSequenceElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool NestedSequenceElementPubSubType::compute_key( bool NestedSequenceElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool NestedSequenceElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ComplexSequenceElementPubSubType::~ComplexSequenceElementPubSubType() bool ComplexSequenceElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ComplexSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ComplexSequenceElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ComplexSequenceElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ComplexSequenceElementPubSubType::deserialize( ComplexSequenceElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ComplexSequenceElementPubSubType::delete_data( } bool ComplexSequenceElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ComplexSequenceElementPubSubType::compute_key( bool ComplexSequenceElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ComplexSequenceElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ SequenceStructPubSubType::~SequenceStructPubSubType() bool SequenceStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const SequenceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool SequenceStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool SequenceStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool SequenceStructPubSubType::deserialize( SequenceStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void SequenceStructPubSubType::delete_data( } bool SequenceStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool SequenceStructPubSubType::compute_key( bool SequenceStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool SequenceStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp index 305c6dedcea..a349ba40e30 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx index bd0f053744c..a14a11b75ab 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.cxx @@ -53,18 +53,18 @@ StringStructPubSubType::~StringStructPubSubType() bool StringStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool StringStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StringStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool StringStructPubSubType::deserialize( StringStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void StringStructPubSubType::delete_data( } bool StringStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool StringStructPubSubType::compute_key( bool StringStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool StringStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp index 893879e22f0..64039ed2afc 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx index 798a5158000..7bbafa8f696 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.cxx @@ -53,18 +53,18 @@ GrandparentStructPubSubType::~GrandparentStructPubSubType() bool GrandparentStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const GrandparentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool GrandparentStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool GrandparentStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool GrandparentStructPubSubType::deserialize( GrandparentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void GrandparentStructPubSubType::delete_data( } bool GrandparentStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool GrandparentStructPubSubType::compute_key( bool GrandparentStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool GrandparentStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -233,18 +233,18 @@ ParentStructPubSubType::~ParentStructPubSubType() bool ParentStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ParentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -263,12 +263,12 @@ bool ParentStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ParentStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -277,14 +277,14 @@ bool ParentStructPubSubType::deserialize( ParentStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -329,8 +329,8 @@ void ParentStructPubSubType::delete_data( } bool ParentStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -349,7 +349,7 @@ bool ParentStructPubSubType::compute_key( bool ParentStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -373,14 +373,14 @@ bool ParentStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -413,18 +413,18 @@ NestedStructElementPubSubType::~NestedStructElementPubSubType() bool NestedStructElementPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const NestedStructElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -443,12 +443,12 @@ bool NestedStructElementPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool NestedStructElementPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -457,14 +457,14 @@ bool NestedStructElementPubSubType::deserialize( NestedStructElement* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -509,8 +509,8 @@ void NestedStructElementPubSubType::delete_data( } bool NestedStructElementPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -529,7 +529,7 @@ bool NestedStructElementPubSubType::compute_key( bool NestedStructElementPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -553,14 +553,14 @@ bool NestedStructElementPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -593,18 +593,18 @@ StructStructPubSubType::~StructStructPubSubType() bool StructStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const StructStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -623,12 +623,12 @@ bool StructStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool StructStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -637,14 +637,14 @@ bool StructStructPubSubType::deserialize( StructStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -689,8 +689,8 @@ void StructStructPubSubType::delete_data( } bool StructStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -709,7 +709,7 @@ bool StructStructPubSubType::compute_key( bool StructStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -733,14 +733,14 @@ bool StructStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp index f36283e79e8..d95a4de9966 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -133,11 +133,11 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -145,13 +145,13 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -212,11 +212,11 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -224,13 +224,13 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -291,11 +291,11 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -303,13 +303,13 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx index 61562796504..f48bdf4ced4 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.cxx @@ -53,18 +53,18 @@ UnionStructPubSubType::~UnionStructPubSubType() bool UnionStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const UnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool UnionStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool UnionStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool UnionStructPubSubType::deserialize( UnionStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void UnionStructPubSubType::delete_data( } bool UnionStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool UnionStructPubSubType::compute_key( bool UnionStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool UnionStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp index 86d15c99e42..4338f821c74 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp @@ -54,11 +54,11 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx index 4965e5656dc..94f79a4b011 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.cxx @@ -53,18 +53,18 @@ PrimitivesStructPubSubType::~PrimitivesStructPubSubType() bool PrimitivesStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -83,12 +83,12 @@ bool PrimitivesStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool PrimitivesStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -97,14 +97,14 @@ bool PrimitivesStructPubSubType::deserialize( PrimitivesStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -149,8 +149,8 @@ void PrimitivesStructPubSubType::delete_data( } bool PrimitivesStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -169,7 +169,7 @@ bool PrimitivesStructPubSubType::compute_key( bool PrimitivesStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -193,14 +193,14 @@ bool PrimitivesStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -242,18 +242,18 @@ AllStructPubSubType::~AllStructPubSubType() bool AllStructPubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const AllStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -272,12 +272,12 @@ bool AllStructPubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool AllStructPubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -286,14 +286,14 @@ bool AllStructPubSubType::deserialize( AllStruct* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -338,8 +338,8 @@ void AllStructPubSubType::delete_data( } bool AllStructPubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -358,7 +358,7 @@ bool AllStructPubSubType::compute_key( bool AllStructPubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -382,14 +382,14 @@ bool AllStructPubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; @@ -422,18 +422,18 @@ ComprehensiveTypePubSubType::~ComprehensiveTypePubSubType() bool ComprehensiveTypePubSubType::serialize( const void* const data, - SerializedPayload_t* payload, + SerializedPayload_t& payload, DataRepresentationId_t data_representation) { const ComprehensiveType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->max_size); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); // Object that serializes the data. eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::CdrVersion::XCDRv1 : eprosima::fastcdr::CdrVersion::XCDRv2); - payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; ser.set_encoding_flag( data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ? eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR : @@ -452,12 +452,12 @@ bool ComprehensiveTypePubSubType::serialize( } // Get the serialized length - payload->length = static_cast(ser.get_serialized_data_length()); + payload.length = static_cast(ser.get_serialized_data_length()); return true; } bool ComprehensiveTypePubSubType::deserialize( - SerializedPayload_t* payload, + SerializedPayload_t& payload, void* data) { try @@ -466,14 +466,14 @@ bool ComprehensiveTypePubSubType::deserialize( ComprehensiveType* p_type = static_cast(data); // Object that manages the raw buffer. - eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload->data), payload->length); + eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.length); // Object that deserializes the data. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN); // Deserialize encapsulation. deser.read_encapsulation(); - payload->encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; + payload.encapsulation = deser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize the object. deser >> *p_type; @@ -518,8 +518,8 @@ void ComprehensiveTypePubSubType::delete_data( } bool ComprehensiveTypePubSubType::compute_key( - SerializedPayload_t* payload, - InstanceHandle_t* handle, + SerializedPayload_t& payload, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -538,7 +538,7 @@ bool ComprehensiveTypePubSubType::compute_key( bool ComprehensiveTypePubSubType::compute_key( const void* const data, - InstanceHandle_t* handle, + InstanceHandle_t& handle, bool force_md5) { if (!is_compute_key_provided) @@ -562,14 +562,14 @@ bool ComprehensiveTypePubSubType::compute_key( md5_.finalize(); for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = md5_.digest[i]; + handle.value[i] = md5_.digest[i]; } } else { for (uint8_t i = 0; i < 16; ++i) { - handle->value[i] = key_buffer_[i]; + handle.value[i] = key_buffer_[i]; } } return true; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index 7ba7d397265..7d60293617b 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -54,11 +54,11 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -66,13 +66,13 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -142,11 +142,11 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -154,13 +154,13 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; @@ -221,11 +221,11 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t& payload, void* data) override; eProsima_user_DllExport uint32_t calculate_serialized_size( @@ -233,13 +233,13 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* payload, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport bool compute_key( const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* create_data() override; diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp index 357e6b58e63..0a31919979d 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp @@ -43,14 +43,14 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const /*data*/, - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, eprosima::fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -74,8 +74,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType } bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::SerializedPayload_t& /*payload*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -83,7 +83,7 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index 0e0accf3498..caabacabd94 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -88,14 +88,14 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( const void* const /*data*/, - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, fastdds::dds::DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastdds::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, void* /*data*/) override { return true; @@ -119,8 +119,8 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType } bool compute_key( - fastdds::rtps::SerializedPayload_t* /*payload*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::SerializedPayload_t& /*payload*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; @@ -128,7 +128,7 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool compute_key( const void* const /*data*/, - fastdds::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t& /*ihandle*/, bool /*force_md5*/) override { return true; From b819f08d0ebac9083c19a1f24d84650c1995a9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Tue, 16 Jul 2024 09:55:49 +0200 Subject: [PATCH 09/14] Refs #21349. Fix bitsets after regenerate code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../DynamicTypesDDSTypesTest.cpp | 2 +- .../DynamicTypesAliasesDDSTypesTests.cpp | 12 +- .../DynamicTypesArraysDDSTypesTests.cpp | 62 +++++----- .../DynamicTypesBitsetsDDSTypesTests.cpp | 10 +- .../DynamicTypesInheritanceDDSTypesTests.cpp | 28 ++--- .../DynamicTypesMapsDDSTypesTests.cpp | 112 +++++++++--------- .../DynamicTypesSequencesDDSTypesTests.cpp | 24 ++-- .../DynamicTypesStructuresDDSTypesTests.cpp | 24 ++-- .../DynamicTypesUnionsDDSTypesTests.cpp | 12 +- 9 files changed, 143 insertions(+), 143 deletions(-) diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp index 2d2a4cb8506..e668790bb6d 100644 --- a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp +++ b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp @@ -238,7 +238,7 @@ DynamicType::_ref_type DynamicTypesDDSTypesTest::create_inner_bitset_helper() MemberDescriptor::_ref_type bitset_member {traits::make_shared()}; bitset_member->name(bitfield_a); - bitset_member->type(DynamicTypeBuilderFactory::get_instance()->get_primitive_type(TK_BYTE)); + bitset_member->type(DynamicTypeBuilderFactory::get_instance()->get_primitive_type(TK_UINT8)); bitset_member->id(0); bitset_builder->add_member(bitset_member); bitset_member = traits::make_shared(); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp index f01558a524c..3e62e76a58c 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp @@ -1234,8 +1234,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet octet_value = 5; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t uint8_value = 5; + uint8_t test_uint8_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; @@ -1244,10 +1244,10 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasBitset) int16_t test_short_value = 0; DynamicData::_ref_type bitset_data = data->loan_value(data->get_member_id_by_name(struct_member_name)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); @@ -1267,7 +1267,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasBitset) AliasBitset alias_data; TypeSupport static_pubsubType {new AliasBitsetPubSubType()}; check_serialization_deserialization(struct_type, data, encoding, alias_data, static_pubsubType); - EXPECT_EQ(alias_data.value().a, test_octet_value); + EXPECT_EQ(alias_data.value().a, test_uint8_value); EXPECT_EQ(alias_data.value().b, test_bool_value); EXPECT_EQ(alias_data.value().c, test_ushort_value); EXPECT_EQ(alias_data.value().d, test_short_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp index 222385c95f2..9d525ef929b 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp @@ -1403,9 +1403,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet first_octet_value = 5; - eprosima::fastdds::rtps::octet second_octet_value = 7; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t first_uint8_value = 5; + uint8_t second_uint8_value = 7; + uint8_t test_uint8_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool test_bool_value = false; @@ -1419,11 +1419,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) ASSERT_TRUE(array_data); DynamicData::_ref_type bitset_data = array_data->loan_value(0); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), first_octet_value), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), first_uint8_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(first_octet_value, test_octet_value); + EXPECT_EQ(first_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), first_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -1442,11 +1442,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) EXPECT_EQ(array_data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = array_data->loan_value(1); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name( - bitfield_a), second_octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name( + bitfield_a), second_uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(second_octet_value, test_octet_value); + EXPECT_EQ(second_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), second_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -1468,7 +1468,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) { bitset_data = array_data->loan_value(i); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name( + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name( bitfield_a)), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); @@ -1476,7 +1476,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) bitfield_c)), RETCODE_OK); EXPECT_EQ(bitset_data->get_int16_value(test_short_value, bitset_data->get_member_id_by_name( bitfield_d)), RETCODE_OK); - EXPECT_EQ(test_octet_value, 0u); + EXPECT_EQ(test_uint8_value, 0u); EXPECT_EQ(test_bool_value, false); EXPECT_EQ(test_ushort_value, 0u); EXPECT_EQ(test_short_value, 0); @@ -1488,11 +1488,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) ArrayBitset struct_data; TypeSupport static_pubsubType {new ArrayBitsetPubSubType()}; check_serialization_deserialization(struct_type, data, encoding, struct_data, static_pubsubType); - EXPECT_EQ(struct_data.var_array_bitset()[0].a, first_octet_value); + EXPECT_EQ(struct_data.var_array_bitset()[0].a, first_uint8_value); EXPECT_EQ(struct_data.var_array_bitset()[0].b, first_bool_value); EXPECT_EQ(struct_data.var_array_bitset()[0].c, first_ushort_value); EXPECT_EQ(struct_data.var_array_bitset()[0].d, first_short_value); - EXPECT_EQ(struct_data.var_array_bitset()[1].a, second_octet_value); + EXPECT_EQ(struct_data.var_array_bitset()[1].a, second_uint8_value); EXPECT_EQ(struct_data.var_array_bitset()[1].b, second_bool_value); EXPECT_EQ(struct_data.var_array_bitset()[1].c, second_ushort_value); EXPECT_EQ(struct_data.var_array_bitset()[1].d, second_short_value); @@ -3200,10 +3200,10 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet first_octet_value = 5; - eprosima::fastdds::rtps::octet second_octet_value = 7; - eprosima::fastdds::rtps::octet third_octet_value = 1; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t first_uint8_value = 5; + uint8_t second_uint8_value = 7; + uint8_t third_uint8_value = 1; + uint8_t test_uint8_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool third_bool_value = true; @@ -3220,11 +3220,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) ASSERT_TRUE(array_data); DynamicData::_ref_type bitset_data = array_data->loan_value(0); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), first_octet_value), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), first_uint8_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(first_octet_value, test_octet_value); + EXPECT_EQ(first_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), first_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -3243,11 +3243,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) EXPECT_EQ(array_data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = array_data->loan_value(33); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name( - bitfield_a), second_octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name( + bitfield_a), second_uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(second_octet_value, test_octet_value); + EXPECT_EQ(second_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), second_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -3266,11 +3266,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) EXPECT_EQ(array_data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = array_data->loan_value(857); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), third_octet_value), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), third_uint8_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(third_octet_value, test_octet_value); + EXPECT_EQ(third_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), third_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -3302,21 +3302,21 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) { if (i == 0 && j == 0 && k == 0) { - EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, first_octet_value); + EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, first_uint8_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].b, first_bool_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].c, first_ushort_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].d, first_short_value); } else if (i == 0 && j == 3 && k == 3) { - EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, second_octet_value); + EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, second_uint8_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].b, second_bool_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].c, second_ushort_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].d, second_short_value); } else if (i == 8 && j == 5 && k == 7) { - EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, third_octet_value); + EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].a, third_uint8_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].b, third_bool_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].c, third_ushort_value); EXPECT_EQ(struct_data.var_array_bitset()[i][j][k].d, third_short_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp index 5733edd180f..3a32d2064d5 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp @@ -214,11 +214,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetStruct) DynamicData::_ref_type var_innerbitsethelper_data = data->loan_value(data->get_member_id_by_name(var_innerbitsethelper_name)); ASSERT_TRUE(var_innerbitsethelper_data); - EXPECT_EQ(var_innerbitsethelper_data->set_byte_value( - var_innerbitsethelper_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); - EXPECT_EQ(var_innerbitsethelper_data->get_byte_value( - test_octet_value, var_innerbitsethelper_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(var_innerbitsethelper_data->set_uint8_value( + var_innerbitsethelper_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); + EXPECT_EQ(var_innerbitsethelper_data->get_uint8_value( + test_uint8_value, var_innerbitsethelper_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); + EXPECT_EQ(uint8_value, uint8_value); EXPECT_EQ(var_innerbitsethelper_data->set_boolean_value( var_innerbitsethelper_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(var_innerbitsethelper_data->get_boolean_value( diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp index 57c2dd04037..9ad4044c3a1 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp @@ -861,12 +861,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet octet_value {5}; + uint8_t uint8_value {5}; bool bool_value {true}; uint16_t ushort_value {1000}; int16_t short_value {2000}; uint32_t long_value {111}; - eprosima::fastdds::rtps::octet test_octet_value; + uint8_t test_uint8_value; bool test_bool_value; uint16_t test_ushort_value; int16_t test_short_value; @@ -875,14 +875,14 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) // Set values. DynamicData::_ref_type bitset_data {data->loan_value(data->get_member_id_by_name(var_InnerBitsetHelperChild))}; ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_uint16_value(bitset_data->get_member_id_by_name(bitfield_c), ushort_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_int16_value(bitset_data->get_member_id_by_name(bitfield_d), short_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_uint32_value(bitset_data->get_member_id_by_name(child_w), long_value), RETCODE_OK); EXPECT_EQ(data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = data->loan_value(data->get_member_id_by_name(var_InnerBitsetHelperChildChild)); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_uint16_value(bitset_data->get_member_id_by_name(bitfield_c), ushort_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_int16_value(bitset_data->get_member_id_by_name(bitfield_d), short_value), RETCODE_OK); @@ -891,7 +891,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) RETCODE_OK); EXPECT_EQ(data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = data->loan_value(data->get_member_id_by_name(var_BitsetAliasInheritanceBitset)); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_uint16_value(bitset_data->get_member_id_by_name(bitfield_c), ushort_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_int16_value(bitset_data->get_member_id_by_name(bitfield_d), short_value), RETCODE_OK); @@ -902,9 +902,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) // Check values bitset_data = data->loan_value(data->get_member_id_by_name(var_InnerBitsetHelperChild)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); EXPECT_EQ(bool_value, test_bool_value); @@ -920,9 +920,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) EXPECT_EQ(data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = data->loan_value(data->get_member_id_by_name(var_InnerBitsetHelperChildChild)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); EXPECT_EQ(bool_value, test_bool_value); @@ -941,9 +941,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) EXPECT_EQ(data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = data->loan_value(data->get_member_id_by_name(var_BitsetAliasInheritanceBitset)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); EXPECT_EQ(bool_value, test_bool_value); @@ -964,18 +964,18 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) TypeSupport static_pubsubType {new BitsetsChildInheritanceStructPubSubType()}; check_serialization_deserialization(struct_type, data, encoding, struct_data, static_pubsubType); - EXPECT_EQ(octet_value, struct_data.var_InnerBitsetHelperChild().a); + EXPECT_EQ(uint8_value, struct_data.var_InnerBitsetHelperChild().a); EXPECT_EQ(bool_value, struct_data.var_InnerBitsetHelperChild().b); EXPECT_EQ(ushort_value, struct_data.var_InnerBitsetHelperChild().c); EXPECT_EQ(short_value, struct_data.var_InnerBitsetHelperChild().d); EXPECT_EQ(long_value, struct_data.var_InnerBitsetHelperChild().child_w); - EXPECT_EQ(octet_value, struct_data.var_InnerBitsetHelperChildChild().a); + EXPECT_EQ(uint8_value, struct_data.var_InnerBitsetHelperChildChild().a); EXPECT_EQ(bool_value, struct_data.var_InnerBitsetHelperChildChild().b); EXPECT_EQ(ushort_value, struct_data.var_InnerBitsetHelperChildChild().c); EXPECT_EQ(short_value, struct_data.var_InnerBitsetHelperChildChild().d); EXPECT_EQ(long_value, struct_data.var_InnerBitsetHelperChildChild().child_w); EXPECT_EQ(ushort_value, struct_data.var_InnerBitsetHelperChildChild().childchild_z); - EXPECT_EQ(octet_value, struct_data.var_BitsetAliasInheritanceBitset().a); + EXPECT_EQ(uint8_value, struct_data.var_BitsetAliasInheritanceBitset().a); EXPECT_EQ(bool_value, struct_data.var_BitsetAliasInheritanceBitset().b); EXPECT_EQ(ushort_value, struct_data.var_BitsetAliasInheritanceBitset().c); EXPECT_EQ(short_value, struct_data.var_BitsetAliasInheritanceBitset().d); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp index 1e9adaeb60b..6c9f298ce13 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp @@ -2349,12 +2349,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapShortInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {std::int16_t(-100), {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {std::int16_t(50), {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {std::int16_t(600), {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {std::int16_t(-100), {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {std::int16_t(50), {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {std::int16_t(600), {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -2366,7 +2366,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapShortInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -2386,7 +2386,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapShortInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -4244,12 +4244,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapUShortInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {std::uint16_t(100), {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {std::uint16_t(50), {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {std::uint16_t(600), {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {std::uint16_t(100), {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {std::uint16_t(50), {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {std::uint16_t(600), {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -4261,7 +4261,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapUShortInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -4281,7 +4281,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapUShortInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -6138,12 +6138,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {-100, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {-100, {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50, {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600, {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -6155,7 +6155,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -6175,7 +6175,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -8032,12 +8032,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {100u, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50u, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600u, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {100u, {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50u, {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600u, {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -8049,7 +8049,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -8069,7 +8069,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -9926,12 +9926,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {-100, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {-100, {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50, {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600, {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -9943,7 +9943,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -9963,7 +9963,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -11820,12 +11820,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {100u, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50u, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600u, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {100u, {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50u, {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600u, {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -11837,7 +11837,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -11857,7 +11857,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongLongInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(std::to_string(map_element.first))); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -13718,12 +13718,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapStringInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {"we", {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {"are", {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {"testing", {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {"we", {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {"are", {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {"testing", {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -13735,7 +13735,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapStringInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(map_element.first)); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -13755,7 +13755,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapStringInnerBitsetHelper) auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(map_element.first)); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, @@ -15614,12 +15614,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapInnerAliasBoundedStringHelperIn DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {"we", {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {"are", {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {"testing", {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {"we", {std::uint8_t(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {"are", {std::uint8_t(7), false, std::uint16_t(555), std::int16_t(20)}}, + {"testing", {std::uint8_t(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastdds::rtps::octet test_value1; + uint8_t test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -15632,7 +15632,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapInnerAliasBoundedStringHelperIn auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(map_element.first)); EXPECT_EQ(RETCODE_OK, - inner_bitset->set_byte_value(inner_bitset->get_member_id_by_name(bitfield_a), + inner_bitset->set_uint8_value(inner_bitset->get_member_id_by_name(bitfield_a), std::get<0>(map_element.second))); EXPECT_EQ(RETCODE_OK, inner_bitset->set_boolean_value(inner_bitset->get_member_id_by_name(bitfield_b), @@ -15652,7 +15652,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapInnerAliasBoundedStringHelperIn auto inner_bitset = map_data->loan_value(map_data->get_member_id_by_name(map_element.first)); EXPECT_EQ(RETCODE_OK, - inner_bitset->get_byte_value(test_value1, + inner_bitset->get_uint8_value(test_value1, inner_bitset->get_member_id_by_name(bitfield_a))); EXPECT_EQ(std::get<0>(map_element.second), test_value1); EXPECT_EQ(RETCODE_OK, diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp index 8279ca58272..3045be4ee6e 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp @@ -1237,9 +1237,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_SequenceBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet first_octet_value = 5; - eprosima::fastdds::rtps::octet second_octet_value = 7; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t first_uint8_value = 5; + uint8_t second_uint8_value = 7; + uint8_t test_uint8_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool test_bool_value = false; @@ -1253,11 +1253,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_SequenceBitset) ASSERT_TRUE(seq_data); DynamicData::_ref_type bitset_data = seq_data->loan_value(0); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), first_octet_value), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), first_uint8_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(first_octet_value, test_octet_value); + EXPECT_EQ(first_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), first_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -1276,11 +1276,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_SequenceBitset) EXPECT_EQ(seq_data->return_loaned_value(bitset_data), RETCODE_OK); bitset_data = seq_data->loan_value(1); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name( - bitfield_a), second_octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name( + bitfield_a), second_uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(second_octet_value, test_octet_value); + EXPECT_EQ(second_uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name( bitfield_b), second_bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( @@ -1307,11 +1307,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_SequenceBitset) seq_data = data->loan_value(data->get_member_id_by_name(var_bitset_seq)); ASSERT_TRUE(seq_data); EXPECT_EQ(struct_data.var_sequence_bitset().size(), seq_data->get_item_count()); - EXPECT_EQ(struct_data.var_sequence_bitset()[0].a, first_octet_value); + EXPECT_EQ(struct_data.var_sequence_bitset()[0].a, first_uint8_value); EXPECT_EQ(struct_data.var_sequence_bitset()[0].b, first_bool_value); EXPECT_EQ(struct_data.var_sequence_bitset()[0].c, first_ushort_value); EXPECT_EQ(struct_data.var_sequence_bitset()[0].d, first_short_value); - EXPECT_EQ(struct_data.var_sequence_bitset()[1].a, second_octet_value); + EXPECT_EQ(struct_data.var_sequence_bitset()[1].a, second_uint8_value); EXPECT_EQ(struct_data.var_sequence_bitset()[1].b, second_bool_value); EXPECT_EQ(struct_data.var_sequence_bitset()[1].c, second_ushort_value); EXPECT_EQ(struct_data.var_sequence_bitset()[1].d, second_short_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp index dca74ca7cdc..70957a55600 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp @@ -1286,8 +1286,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastdds::rtps::octet octet_value = 5; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t uint8_value = 5; + uint8_t test_uint8_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; @@ -1296,10 +1296,10 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructBitset) int16_t test_short_value = 0; DynamicData::_ref_type bitset_data = data->loan_value(data->get_member_id_by_name(var_bitset_name)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); @@ -1319,7 +1319,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructBitset) StructBitset data_struct; TypeSupport static_pubsubType {new StructBitsetPubSubType()}; check_serialization_deserialization(struct_type, data, encoding, data_struct, static_pubsubType); - EXPECT_EQ(data_struct.var_bitset().a, test_octet_value); + EXPECT_EQ(data_struct.var_bitset().a, test_uint8_value); EXPECT_EQ(data_struct.var_bitset().b, test_bool_value); EXPECT_EQ(data_struct.var_bitset().c, test_ushort_value); EXPECT_EQ(data_struct.var_bitset().d, test_short_value); @@ -1370,7 +1370,7 @@ struct testing_values_struct Int16Seq test_array_value; Int32Seq test_seq_value; int32_t test_map_value; - eprosima::fastdds::rtps::octet test_octet_value; + uint8_t test_uint8_value; }; void check_structure_static_data( @@ -1415,7 +1415,7 @@ void check_structure_static_data( EXPECT_EQ(struct_data.var_StructUnion().var_union().shortValue(), testing_values.test_short_value); EXPECT_EQ(struct_data.var_StructStructure().var_structure().field1(), testing_values.test_long_value); EXPECT_EQ(struct_data.var_StructStructure().var_structure().field2(), testing_values.test_float_value); - EXPECT_EQ(struct_data.var_StructBitset().var_bitset().a, testing_values.test_octet_value); + EXPECT_EQ(struct_data.var_StructBitset().var_bitset().a, testing_values.test_uint8_value); EXPECT_EQ(struct_data.var_StructBitset().var_bitset().b, testing_values.test_bool_value); EXPECT_EQ(struct_data.var_StructBitset().var_bitset().c, testing_values.test_ushort_value); EXPECT_EQ(struct_data.var_StructBitset().var_bitset().d, testing_values.test_short_value); @@ -1567,7 +1567,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructStructures) Int16Seq array_value = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; Int32Seq seq_value = {10, 20}; int32_t map_value = 253; - eprosima::fastdds::rtps::octet octet_value = 7; + uint8_t uint8_value = 7; testing_values_struct testing_values; DynamicData::_ref_type short_struct_data = data->loan_value(data->get_member_id_by_name(var_short_struct_name)); @@ -1787,11 +1787,11 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructStructures) testing_values.test_bool_value = false; testing_values.test_ushort_value = 0; testing_values.test_short_value = 0; - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_uint16_value(bitset_data->get_member_id_by_name(bitfield_c), ushort_value), RETCODE_OK); EXPECT_EQ(bitset_data->set_int16_value(bitset_data->get_member_id_by_name(bitfield_d), short_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(testing_values.test_octet_value, + EXPECT_EQ(bitset_data->get_uint8_value(testing_values.test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(testing_values.test_bool_value, bitset_data->get_member_id_by_name(bitfield_b)), RETCODE_OK); @@ -1799,7 +1799,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructStructures) bitset_data->get_member_id_by_name(bitfield_c)), RETCODE_OK); EXPECT_EQ(bitset_data->get_int16_value(testing_values.test_short_value, bitset_data->get_member_id_by_name(bitfield_d)), RETCODE_OK); - EXPECT_EQ(octet_value, testing_values.test_octet_value); + EXPECT_EQ(uint8_value, testing_values.test_uint8_value); EXPECT_EQ(bool_value, testing_values.test_bool_value); EXPECT_EQ(ushort_value, testing_values.test_ushort_value); EXPECT_EQ(short_value, testing_values.test_short_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp index a35fad57614..98a705460ae 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp @@ -1630,8 +1630,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionInnerBitsetHelper) DynamicData::_ref_type union_data = data->loan_value(data->get_member_id_by_name(var_union_bitset_name)); ASSERT_TRUE(union_data); - eprosima::fastdds::rtps::octet octet_value = 5; - eprosima::fastdds::rtps::octet test_octet_value = 0; + uint8_t uint8_value = 5; + uint8_t test_uint8_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; @@ -1640,10 +1640,10 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionInnerBitsetHelper) int16_t test_short_value = 0; DynamicData::_ref_type bitset_data = union_data->loan_value(union_data->get_member_id_by_name(var_union_member_x)); ASSERT_TRUE(bitset_data); - EXPECT_EQ(bitset_data->set_byte_value(bitset_data->get_member_id_by_name(bitfield_a), octet_value), RETCODE_OK); - EXPECT_EQ(bitset_data->get_byte_value(test_octet_value, bitset_data->get_member_id_by_name(bitfield_a)), + EXPECT_EQ(bitset_data->set_uint8_value(bitset_data->get_member_id_by_name(bitfield_a), uint8_value), RETCODE_OK); + EXPECT_EQ(bitset_data->get_uint8_value(test_uint8_value, bitset_data->get_member_id_by_name(bitfield_a)), RETCODE_OK); - EXPECT_EQ(octet_value, test_octet_value); + EXPECT_EQ(uint8_value, test_uint8_value); EXPECT_EQ(bitset_data->set_boolean_value(bitset_data->get_member_id_by_name(bitfield_b), bool_value), RETCODE_OK); EXPECT_EQ(bitset_data->get_boolean_value(test_bool_value, bitset_data->get_member_id_by_name( bitfield_b)), RETCODE_OK); @@ -1665,7 +1665,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionInnerBitsetHelper) TypeSupport static_pubsubType {new UnionInnerBitsetHelperPubSubType()}; check_serialization_deserialization(struct_type, data, encoding, struct_data, static_pubsubType); - EXPECT_EQ(struct_data.var_union_my_bitset().x().a, test_octet_value); + EXPECT_EQ(struct_data.var_union_my_bitset().x().a, test_uint8_value); EXPECT_EQ(struct_data.var_union_my_bitset().x().b, test_bool_value); EXPECT_EQ(struct_data.var_union_my_bitset().x().c, test_ushort_value); EXPECT_EQ(struct_data.var_union_my_bitset().x().d, test_short_value); From 146ea045f3327eaf1f63950acd6ca96658a6bb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Wed, 17 Jul 2024 07:47:39 +0200 Subject: [PATCH 10/14] Refs #21349. Fix test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- test/unittest/dds/subscriber/DataReaderHistoryTests.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 7bb3cfa61c5..1b69e5672dc 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -132,9 +132,6 @@ TEST(DataReaderHistory, exclusive_ownership_non_keyed_sample_reception) TEST(DataReaderHistory, exclusive_ownership_keyed_sample_reception) { TestType* type_ = new TestType(); - // These functions was called due to the type is keyed. - EXPECT_CALL(*type_, create_data()).Times(1); - EXPECT_CALL(*type_, delete_data(nullptr)).Times(1); const TypeSupport type(type_); type->is_compute_key_provided = true; From eb276b08fec4155da95cb4d50175c8c0cb8ba4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Wed, 17 Jul 2024 08:11:01 +0200 Subject: [PATCH 11/14] Refs #21349. Regenerate code after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../types/CalculatorPubSubTypes.cxx | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx index df199015da6..850e82a69c9 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.cxx @@ -33,12 +33,12 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; CalculatorRequestTypePubSubType::CalculatorRequestTypePubSubType() { - set_name("RequestType"); - uint32_t type_size = RequestType_max_cdr_typesize; + set_name("CalculatorRequestType"); + uint32_t type_size = CalculatorRequestType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = RequestType_max_key_cdr_typesize > 16 ? RequestType_max_key_cdr_typesize : 16; + is_compute_key_provided = true; + uint32_t key_length = CalculatorRequestType_max_key_cdr_typesize > 16 ? CalculatorRequestType_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } @@ -87,7 +87,7 @@ bool CalculatorRequestTypePubSubType::serialize( return true; } -bool RequestTypePubSubType::deserialize( +bool CalculatorRequestTypePubSubType::deserialize( SerializedPayload_t& payload, void* data) { @@ -117,7 +117,7 @@ bool RequestTypePubSubType::deserialize( return true; } -uint32_t RequestTypePubSubType::calculate_serialized_size( +uint32_t CalculatorRequestTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { @@ -128,8 +128,8 @@ uint32_t RequestTypePubSubType::calculate_serialized_size( eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -137,18 +137,18 @@ uint32_t RequestTypePubSubType::calculate_serialized_size( } } -void* RequestTypePubSubType::create_data() +void* CalculatorRequestTypePubSubType::create_data() { return reinterpret_cast(new CalculatorRequestType()); } -void RequestTypePubSubType::delete_data( +void CalculatorRequestTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool RequestTypePubSubType::compute_key( +bool CalculatorRequestTypePubSubType::compute_key( SerializedPayload_t& payload, InstanceHandle_t& handle, bool force_md5) @@ -158,7 +158,7 @@ bool RequestTypePubSubType::compute_key( return false; } - RequestType data; + CalculatorRequestType data; if (deserialize(payload, static_cast(&data))) { return compute_key(static_cast(&data), handle, force_md5); @@ -167,7 +167,7 @@ bool RequestTypePubSubType::compute_key( return false; } -bool RequestTypePubSubType::compute_key( +bool CalculatorRequestTypePubSubType::compute_key( const void* const data, InstanceHandle_t& handle, bool force_md5) @@ -181,13 +181,12 @@ bool RequestTypePubSubType::compute_key( // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - RequestType_max_key_cdr_typesize); + CalculatorRequestType_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::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); - if (force_md5 || RequestType_max_key_cdr_typesize > 16) + if (force_md5 || CalculatorRequestType_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -214,12 +213,12 @@ void CalculatorRequestTypePubSubType::register_type_object_representation() CalculatorReplyTypePubSubType::CalculatorReplyTypePubSubType() { - set_name("ReplyType"); - uint32_t type_size = ReplyType_max_cdr_typesize; + set_name("CalculatorReplyType"); + uint32_t type_size = CalculatorReplyType_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ - is_compute_key_provided = false; - uint32_t key_length = ReplyType_max_key_cdr_typesize > 16 ? ReplyType_max_key_cdr_typesize : 16; + is_compute_key_provided = true; + uint32_t key_length = CalculatorReplyType_max_key_cdr_typesize > 16 ? CalculatorReplyType_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } @@ -268,7 +267,7 @@ bool CalculatorReplyTypePubSubType::serialize( return true; } -bool ReplyTypePubSubType::deserialize( +bool CalculatorReplyTypePubSubType::deserialize( SerializedPayload_t& payload, void* data) { @@ -298,7 +297,7 @@ bool ReplyTypePubSubType::deserialize( return true; } -uint32_t ReplyTypePubSubType::calculate_serialized_size( +uint32_t CalculatorReplyTypePubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { @@ -309,8 +308,8 @@ uint32_t ReplyTypePubSubType::calculate_serialized_size( eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -318,18 +317,18 @@ uint32_t ReplyTypePubSubType::calculate_serialized_size( } } -void* ReplyTypePubSubType::create_data() +void* CalculatorReplyTypePubSubType::create_data() { return reinterpret_cast(new CalculatorReplyType()); } -void ReplyTypePubSubType::delete_data( +void CalculatorReplyTypePubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool ReplyTypePubSubType::compute_key( +bool CalculatorReplyTypePubSubType::compute_key( SerializedPayload_t& payload, InstanceHandle_t& handle, bool force_md5) @@ -339,7 +338,7 @@ bool ReplyTypePubSubType::compute_key( return false; } - ReplyType data; + CalculatorReplyType data; if (deserialize(payload, static_cast(&data))) { return compute_key(static_cast(&data), handle, force_md5); @@ -348,7 +347,7 @@ bool ReplyTypePubSubType::compute_key( return false; } -bool ReplyTypePubSubType::compute_key( +bool CalculatorReplyTypePubSubType::compute_key( const void* const data, InstanceHandle_t& handle, bool force_md5) @@ -362,13 +361,12 @@ bool ReplyTypePubSubType::compute_key( // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - ReplyType_max_key_cdr_typesize); + CalculatorReplyType_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::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); - if (force_md5 || ReplyType_max_key_cdr_typesize > 16) + if (force_md5 || CalculatorReplyType_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -393,5 +391,6 @@ void CalculatorReplyTypePubSubType::register_type_object_representation() register_CalculatorReplyType_type_identifier(type_identifiers_); } + // Include auxiliary functions like for serializing/deserializing. #include "CalculatorCdrAux.ipp" From b9ee05117b603f9906f896aa14f026765f69565d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Wed, 17 Jul 2024 10:50:13 +0200 Subject: [PATCH 12/14] Refs #21349. Fix in fastdds_python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- .../ConfigurationPubSubTypes.hpp | 2 + .../content_filter/HelloWorldPubSubTypes.hpp | 2 + .../HelloWorldPubSubTypes.hpp | 2 + .../HelloWorldPubSubTypes.hpp | 2 + .../HelloWorldPubSubTypes.hpp | 2 + .../HelloWorldPubSubTypes.hpp | 2 + examples/cpp/dds/Keys/samplePubSubTypes.hpp | 2 + .../LoanableHelloWorldPubSubTypes.hpp | 3 +- .../LoanableHelloWorldPubSubTypes.hpp | 3 +- .../DeliveryMechanismsPubSubTypes.hpp | 3 +- .../HelloWorldPubSubTypes.hpp | 2 + .../flow_control/FlowControlPubSubTypes.hpp | 2 + .../cpp/hello_world/HelloWorldPubSubTypes.hpp | 2 + .../types/CalculatorPubSubTypes.hpp | 4 + .../cpp/security/HelloWorldPubSubTypes.hpp | 2 + .../HelloWorldPubSubTypes.hpp | 2 + include/fastdds/dds/topic/TopicDataType.hpp | 15 +- .../dds_xtypes_typeobjectPubSubTypes.hpp | 202 ++++++- .../detail/TypeLookupTypesPubSubTypes.hpp | 12 + .../detail/rpc_typesPubSubTypes.hpp | 17 +- .../types/monitorservice_typesPubSubTypes.hpp | 14 + src/cpp/statistics/types/typesPubSubTypes.hpp | 28 + test/blackbox/types/Data1mbPubSubTypes.hpp | 2 + test/blackbox/types/Data64kbPubSubTypes.hpp | 2 + test/blackbox/types/FixedSizedPubSubTypes.hpp | 3 +- test/blackbox/types/HelloWorldPubSubTypes.hpp | 2 + .../types/KeyedData1mbPubSubTypes.hpp | 2 + .../types/KeyedHelloWorldPubSubTypes.hpp | 2 + test/blackbox/types/StringTestPubSubTypes.hpp | 2 + .../types/TestRegression3361PubSubTypes.hpp | 2 + .../types/UnboundedHelloWorldPubSubTypes.hpp | 2 + .../types/core/core_typesPubSubTypes.hpp | 44 ++ .../monitorservice_typesPubSubTypes.hpp | 14 + .../types/statistics/typesPubSubTypes.hpp | 28 + test/dds-types-test/aliasesPubSubTypes.hpp | 50 ++ .../dds-types-test/annotationsPubSubTypes.hpp | 6 + test/dds-types-test/appendablePubSubTypes.hpp | 38 ++ test/dds-types-test/arraysPubSubTypes.hpp | 208 +++++++ test/dds-types-test/bitsetsPubSubTypes.hpp | 2 + test/dds-types-test/constantsPubSubTypes.hpp | 6 + .../declarationsPubSubTypes.hpp | 12 + .../enumerationsPubSubTypes.hpp | 6 + test/dds-types-test/externalPubSubTypes.hpp | 54 ++ test/dds-types-test/finalPubSubTypes.hpp | 54 +- .../helpers/basic_inner_typesPubSubTypes.hpp | 4 + .../dds-types-test/inheritancePubSubTypes.hpp | 16 + test/dds-types-test/keyPubSubTypes.hpp | 34 ++ test/dds-types-test/mapsPubSubTypes.hpp | 524 ++++++++++++++++++ test/dds-types-test/member_idPubSubTypes.hpp | 24 + test/dds-types-test/mutablePubSubTypes.hpp | 38 ++ test/dds-types-test/optionalPubSubTypes.hpp | 162 ++++++ test/dds-types-test/primitivesPubSubTypes.hpp | 42 ++ .../relative_path_includePubSubTypes.hpp | 2 + test/dds-types-test/sequencesPubSubTypes.hpp | 56 ++ test/dds-types-test/stringsPubSubTypes.hpp | 12 + test/dds-types-test/structuresPubSubTypes.hpp | 68 +++ test/dds-types-test/unionsPubSubTypes.hpp | 82 +++ .../allocations/AllocTestTypePubSubTypes.hpp | 2 + .../ContentFilterTestTypePubSubTypes.hpp | 4 + .../gen/alias_structPubSubTypes.hpp | 2 + .../gen/array_structPubSubTypes.hpp | 6 + .../gen/bitmask_structPubSubTypes.hpp | 2 + .../gen/bitset_structPubSubTypes.hpp | 2 + .../gen/enum_structPubSubTypes.hpp | 2 + .../gen/extensibility_structPubSubTypes.hpp | 9 +- .../key_struct/gen/key_structPubSubTypes.hpp | 4 + .../map_struct/gen/map_structPubSubTypes.hpp | 4 + .../gen/primitives_structPubSubTypes.hpp | 2 + .../gen/sequence_structPubSubTypes.hpp | 6 + .../gen/string_structPubSubTypes.hpp | 2 + .../gen/struct_structPubSubTypes.hpp | 8 + .../gen/union_structPubSubTypes.hpp | 2 + .../gen/ComprehensiveTypePubSubTypes.hpp | 6 + 73 files changed, 1952 insertions(+), 41 deletions(-) diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp index c9a1178ff3e..a1aa60218ed 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.hpp +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp @@ -112,6 +112,8 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp index 56aac916f19..8937b288ac5 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.hpp b/examples/cpp/dds/Keys/samplePubSubTypes.hpp index cbc82ef71f5..6d7ba563666 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.hpp +++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp @@ -112,6 +112,8 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp index 3d154f59dae..d6d5f5c0a16 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp @@ -151,10 +151,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp index 3d154f59dae..d6d5f5c0a16 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp @@ -151,10 +151,11 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp index 86540cb8040..af03ba7d1d0 100644 --- a/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp +++ b/examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp @@ -151,10 +151,11 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index f6e0e8c8a25..7e95a4c3268 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -112,6 +112,8 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp index 12c59033738..4114f7bc08c 100644 --- a/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp +++ b/examples/cpp/request_reply/types/CalculatorPubSubTypes.hpp @@ -112,6 +112,8 @@ class CalculatorRequestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class CalculatorReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/security/HelloWorldPubSubTypes.hpp b/examples/cpp/security/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/security/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/security/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp index 70e4cd9df99..c9b0647aef5 100644 --- a/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp +++ b/examples/cpp/static_edp_discovery/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 05862fbe32f..3e840578509 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -83,8 +83,8 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool serialize( const void* const data, - fastdds::rtps::SerializedPayload_t& payload, - DataRepresentationId_t data_representation) = 0; + rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) = 0; /** * Deserialize method, it should be implemented by the user, since it is abstract. @@ -94,7 +94,7 @@ class TopicDataType * @return True if correct. */ FASTDDS_EXPORTED_API virtual bool deserialize( - fastdds::rtps::SerializedPayload_t& payload, + rtps::SerializedPayload_t& payload, void* data) = 0; /*! @@ -106,7 +106,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual uint32_t calculate_serialized_size( const void* const data, - DataRepresentationId_t data_representation) = 0; + eprosima::fastdds::dds::DataRepresentationId_t data_representation) = 0; /** * Create a Data Type. @@ -114,6 +114,7 @@ class TopicDataType * @return Void pointer to the created object. */ FASTDDS_EXPORTED_API virtual void* create_data() = 0; + /** * Remove a previously created object. * @@ -131,8 +132,8 @@ class TopicDataType * @return True if correct. */ FASTDDS_EXPORTED_API virtual bool compute_key( - fastdds::rtps::SerializedPayload_t& payload, - fastdds::rtps::InstanceHandle_t& ihandle, + rtps::SerializedPayload_t& payload, + rtps::InstanceHandle_t& ihandle, bool force_md5 = false) = 0; /** @@ -145,7 +146,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool compute_key( const void* const data, - fastdds::rtps::InstanceHandle_t& ihandle, + rtps::InstanceHandle_t& ihandle, bool force_md5 = false) = 0; /** diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp index a91c109515a..4ca6575f1b9 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp @@ -242,10 +242,11 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -376,10 +377,11 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -471,6 +473,8 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -550,6 +554,8 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -629,6 +635,8 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -708,6 +716,8 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -787,6 +797,8 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -866,6 +878,8 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -945,6 +959,8 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1024,6 +1040,8 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1103,6 +1121,8 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1188,10 +1208,11 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1284,6 +1305,8 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1364,6 +1387,8 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1444,6 +1469,8 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1524,6 +1551,8 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1603,6 +1632,8 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1682,6 +1713,8 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1761,6 +1794,8 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1879,10 +1914,11 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1974,6 +2010,8 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2054,6 +2092,8 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2134,6 +2174,8 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2219,10 +2261,11 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -2310,6 +2353,8 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2389,6 +2434,8 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2468,6 +2515,8 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2547,6 +2596,8 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2626,6 +2677,8 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2706,6 +2759,8 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2785,6 +2840,8 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2865,6 +2922,8 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2945,6 +3004,8 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3024,6 +3085,8 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3103,6 +3166,8 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3182,6 +3247,8 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3261,6 +3328,8 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3340,6 +3409,8 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3419,6 +3490,8 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3498,6 +3571,8 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3577,6 +3652,8 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3657,6 +3734,8 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3737,6 +3816,8 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3816,6 +3897,8 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3895,6 +3978,8 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3974,6 +4059,8 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4053,6 +4140,8 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4132,6 +4221,8 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4211,6 +4302,8 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4290,6 +4383,8 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4369,6 +4464,8 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4448,6 +4545,8 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4527,6 +4626,8 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4606,6 +4707,8 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4685,6 +4788,8 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4764,6 +4869,8 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4843,6 +4950,8 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4961,10 +5070,11 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -5056,6 +5166,8 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5135,6 +5247,8 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5214,6 +5328,8 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5293,6 +5409,8 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5372,6 +5490,8 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5451,6 +5571,8 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5530,6 +5652,8 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5609,6 +5733,8 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5688,6 +5814,8 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5767,6 +5895,8 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5846,6 +5976,8 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5926,6 +6058,8 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6005,6 +6139,8 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6085,6 +6221,8 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6204,10 +6342,11 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -6299,6 +6438,8 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6378,6 +6519,8 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6457,6 +6600,8 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6536,6 +6681,8 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6615,6 +6762,8 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6694,6 +6843,8 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6774,6 +6925,8 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6893,10 +7046,11 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -6990,6 +7144,8 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7069,6 +7225,8 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7148,6 +7306,8 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7227,6 +7387,8 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7307,6 +7469,8 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7387,6 +7551,8 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7466,6 +7632,8 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7545,6 +7713,8 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7624,6 +7794,8 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7703,6 +7875,8 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7783,6 +7957,8 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7866,6 +8042,8 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7946,6 +8124,8 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8026,6 +8206,8 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8106,6 +8288,8 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8186,6 +8370,8 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp index 7aebb900447..152db35ea63 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp @@ -124,6 +124,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -203,6 +205,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -283,6 +287,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -362,6 +368,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -443,6 +451,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -523,6 +533,8 @@ namespace builtin #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp index 67d6d47b2e1..8d685a273cf 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp @@ -159,10 +159,11 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -293,10 +294,11 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -427,10 +429,11 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -561,10 +564,11 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -663,6 +667,8 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -781,10 +787,11 @@ namespace rpc #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; - private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp index 7938c6eaa10..5c62a2bba76 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp @@ -119,6 +119,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -198,6 +200,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -277,6 +281,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -357,6 +363,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -436,6 +444,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -515,6 +525,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -611,6 +623,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/src/cpp/statistics/types/typesPubSubTypes.hpp b/src/cpp/statistics/types/typesPubSubTypes.hpp index b569c375f9e..3a7c7aa0ad6 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.hpp +++ b/src/cpp/statistics/types/typesPubSubTypes.hpp @@ -120,6 +120,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -199,6 +201,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -278,6 +282,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -357,6 +363,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -436,6 +444,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -515,6 +525,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -595,6 +607,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -674,6 +688,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -753,6 +769,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -832,6 +850,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -911,6 +931,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -990,6 +1012,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1069,6 +1093,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1148,6 +1174,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/Data1mbPubSubTypes.hpp b/test/blackbox/types/Data1mbPubSubTypes.hpp index 5a1e5348822..55c750a2eea 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.hpp +++ b/test/blackbox/types/Data1mbPubSubTypes.hpp @@ -112,6 +112,8 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/Data64kbPubSubTypes.hpp b/test/blackbox/types/Data64kbPubSubTypes.hpp index 5a3e342e799..3be8206399d 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.hpp +++ b/test/blackbox/types/Data64kbPubSubTypes.hpp @@ -112,6 +112,8 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.hpp b/test/blackbox/types/FixedSizedPubSubTypes.hpp index 49b19731357..95bf9d34c76 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.hpp +++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp @@ -151,10 +151,11 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/test/blackbox/types/HelloWorldPubSubTypes.hpp b/test/blackbox/types/HelloWorldPubSubTypes.hpp index 56aac916f19..8937b288ac5 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp index 487251a3c5d..cf2e1dc9c0c 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.hpp +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp @@ -112,6 +112,8 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp index 9ef39bb12b1..481164a5a72 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/StringTestPubSubTypes.hpp b/test/blackbox/types/StringTestPubSubTypes.hpp index 5ba86b3fd29..1a391d45e8d 100644 --- a/test/blackbox/types/StringTestPubSubTypes.hpp +++ b/test/blackbox/types/StringTestPubSubTypes.hpp @@ -112,6 +112,8 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.hpp b/test/blackbox/types/TestRegression3361PubSubTypes.hpp index d643801da0e..3f909155f76 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.hpp +++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp @@ -113,6 +113,8 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp index 23beb71e133..cfd44f55696 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp @@ -112,6 +112,8 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/core/core_typesPubSubTypes.hpp b/test/blackbox/types/core/core_typesPubSubTypes.hpp index 421eed63f4b..10945b7926a 100644 --- a/test/blackbox/types/core/core_typesPubSubTypes.hpp +++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp @@ -122,6 +122,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -201,6 +203,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -280,6 +284,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -359,6 +365,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -438,6 +446,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -517,6 +527,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -596,6 +608,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -675,6 +689,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -755,6 +771,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -834,6 +852,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -913,6 +933,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -994,6 +1016,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1073,6 +1097,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1152,6 +1178,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1232,6 +1260,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1311,6 +1341,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1393,6 +1425,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1472,6 +1506,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1551,6 +1587,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1630,6 +1668,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1709,6 +1749,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1789,6 +1831,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp index 7938c6eaa10..5c62a2bba76 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp @@ -119,6 +119,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -198,6 +200,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -277,6 +281,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -357,6 +363,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -436,6 +444,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -515,6 +525,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -611,6 +623,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.hpp b/test/blackbox/types/statistics/typesPubSubTypes.hpp index b569c375f9e..3a7c7aa0ad6 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.hpp +++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp @@ -120,6 +120,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -199,6 +201,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -278,6 +282,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -357,6 +363,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -436,6 +444,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -515,6 +525,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -595,6 +607,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -674,6 +688,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -753,6 +769,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -832,6 +850,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -911,6 +931,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -990,6 +1012,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1069,6 +1093,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1148,6 +1174,8 @@ namespace eprosima #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/aliasesPubSubTypes.hpp b/test/dds-types-test/aliasesPubSubTypes.hpp index ad359a8dcac..dd213b28d4d 100644 --- a/test/dds-types-test/aliasesPubSubTypes.hpp +++ b/test/dds-types-test/aliasesPubSubTypes.hpp @@ -138,6 +138,8 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -217,6 +219,8 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -296,6 +300,8 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -375,6 +381,8 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -454,6 +462,8 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -533,6 +543,8 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -612,6 +624,8 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -691,6 +705,8 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -770,6 +786,8 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -849,6 +867,8 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -928,6 +948,8 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1007,6 +1029,8 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1086,6 +1110,8 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1165,6 +1191,8 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1244,6 +1272,8 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1323,6 +1353,8 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1402,6 +1434,8 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1481,6 +1515,8 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1560,6 +1596,8 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1639,6 +1677,8 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1718,6 +1758,8 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1797,6 +1839,8 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1876,6 +1920,8 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1955,6 +2001,8 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2034,6 +2082,8 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/annotationsPubSubTypes.hpp b/test/dds-types-test/annotationsPubSubTypes.hpp index 075f94445f8..413d5a9a33c 100644 --- a/test/dds-types-test/annotationsPubSubTypes.hpp +++ b/test/dds-types-test/annotationsPubSubTypes.hpp @@ -113,6 +113,8 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -272,6 +276,8 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/appendablePubSubTypes.hpp b/test/dds-types-test/appendablePubSubTypes.hpp index 09451e078f3..b500618d042 100644 --- a/test/dds-types-test/appendablePubSubTypes.hpp +++ b/test/dds-types-test/appendablePubSubTypes.hpp @@ -113,6 +113,8 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/arraysPubSubTypes.hpp b/test/dds-types-test/arraysPubSubTypes.hpp index 21d2905ee2d..78d92d62170 100644 --- a/test/dds-types-test/arraysPubSubTypes.hpp +++ b/test/dds-types-test/arraysPubSubTypes.hpp @@ -113,6 +113,8 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2325,6 +2381,8 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2404,6 +2462,8 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2483,6 +2543,8 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2562,6 +2624,8 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2641,6 +2705,8 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2720,6 +2786,8 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2799,6 +2867,8 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2878,6 +2948,8 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2957,6 +3029,8 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3036,6 +3110,8 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3115,6 +3191,8 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3194,6 +3272,8 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3273,6 +3353,8 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3352,6 +3434,8 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3431,6 +3515,8 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3510,6 +3596,8 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3589,6 +3677,8 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3668,6 +3758,8 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3747,6 +3839,8 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3826,6 +3920,8 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3905,6 +4001,8 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3984,6 +4082,8 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4063,6 +4163,8 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4144,6 +4246,8 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4223,6 +4327,8 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4302,6 +4408,8 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4381,6 +4489,8 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4460,6 +4570,8 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4539,6 +4651,8 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4618,6 +4732,8 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4697,6 +4813,8 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4776,6 +4894,8 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4855,6 +4975,8 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4934,6 +5056,8 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5013,6 +5137,8 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5092,6 +5218,8 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5171,6 +5299,8 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5250,6 +5380,8 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5329,6 +5461,8 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5408,6 +5542,8 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5487,6 +5623,8 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5566,6 +5704,8 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5645,6 +5785,8 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5724,6 +5866,8 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5803,6 +5947,8 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5882,6 +6028,8 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5961,6 +6109,8 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6040,6 +6190,8 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6119,6 +6271,8 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6198,6 +6352,8 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6277,6 +6433,8 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6356,6 +6514,8 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6435,6 +6595,8 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6514,6 +6676,8 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6593,6 +6757,8 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6672,6 +6838,8 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6751,6 +6919,8 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6830,6 +7000,8 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6909,6 +7081,8 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6988,6 +7162,8 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7067,6 +7243,8 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7146,6 +7324,8 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7225,6 +7405,8 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7304,6 +7486,8 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7383,6 +7567,8 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7462,6 +7648,8 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7541,6 +7729,8 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7620,6 +7810,8 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7699,6 +7891,8 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7778,6 +7972,8 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7857,6 +8053,8 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7936,6 +8134,8 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8015,6 +8215,8 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8094,6 +8296,8 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8173,6 +8377,8 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8252,6 +8458,8 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/bitsetsPubSubTypes.hpp b/test/dds-types-test/bitsetsPubSubTypes.hpp index 93cfa50749e..095c73a5fd4 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.hpp +++ b/test/dds-types-test/bitsetsPubSubTypes.hpp @@ -113,6 +113,8 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/constantsPubSubTypes.hpp b/test/dds-types-test/constantsPubSubTypes.hpp index e220029ec8d..f220b1da26f 100644 --- a/test/dds-types-test/constantsPubSubTypes.hpp +++ b/test/dds-types-test/constantsPubSubTypes.hpp @@ -119,6 +119,8 @@ namespace const_module1 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -201,6 +203,8 @@ namespace const_module2 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -281,6 +285,8 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/declarationsPubSubTypes.hpp b/test/dds-types-test/declarationsPubSubTypes.hpp index c649ac154cb..a3e57c0bc1b 100644 --- a/test/dds-types-test/declarationsPubSubTypes.hpp +++ b/test/dds-types-test/declarationsPubSubTypes.hpp @@ -117,6 +117,8 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -197,6 +199,8 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -282,6 +286,8 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -362,6 +368,8 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -443,6 +451,8 @@ namespace declarations_module #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -525,6 +535,8 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/enumerationsPubSubTypes.hpp b/test/dds-types-test/enumerationsPubSubTypes.hpp index f748fdb12bd..bd437018d10 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.hpp +++ b/test/dds-types-test/enumerationsPubSubTypes.hpp @@ -116,6 +116,8 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -195,6 +197,8 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -274,6 +278,8 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/externalPubSubTypes.hpp b/test/dds-types-test/externalPubSubTypes.hpp index 17fbb0e0fe1..95328b37a01 100644 --- a/test/dds-types-test/externalPubSubTypes.hpp +++ b/test/dds-types-test/externalPubSubTypes.hpp @@ -113,6 +113,8 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1931,6 +1977,8 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2011,6 +2059,8 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2092,6 +2142,8 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2171,6 +2223,8 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/finalPubSubTypes.hpp b/test/dds-types-test/finalPubSubTypes.hpp index d6a0bc530a6..a8786266315 100644 --- a/test/dds-types-test/finalPubSubTypes.hpp +++ b/test/dds-types-test/finalPubSubTypes.hpp @@ -152,10 +152,11 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -286,10 +287,11 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -420,10 +422,11 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -554,10 +557,11 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -688,10 +692,11 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -822,10 +827,11 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -956,10 +962,11 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1090,10 +1097,11 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1224,10 +1232,11 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1358,10 +1367,11 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1492,10 +1502,11 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1626,10 +1637,11 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1760,10 +1772,11 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -1855,6 +1868,8 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1940,10 +1955,11 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -2031,6 +2047,8 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2110,6 +2128,8 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2195,10 +2215,11 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -2329,10 +2350,11 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp index b7c51842714..3a34f042fcc 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp @@ -113,6 +113,8 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/inheritancePubSubTypes.hpp b/test/dds-types-test/inheritancePubSubTypes.hpp index 7591d16ff6b..5261daeadca 100644 --- a/test/dds-types-test/inheritancePubSubTypes.hpp +++ b/test/dds-types-test/inheritancePubSubTypes.hpp @@ -113,6 +113,8 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -669,6 +683,8 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/keyPubSubTypes.hpp b/test/dds-types-test/keyPubSubTypes.hpp index c0622681173..998fc9110b7 100644 --- a/test/dds-types-test/keyPubSubTypes.hpp +++ b/test/dds-types-test/keyPubSubTypes.hpp @@ -112,6 +112,8 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -349,6 +355,8 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -428,6 +436,8 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -507,6 +517,8 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -586,6 +598,8 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -665,6 +679,8 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -744,6 +760,8 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -823,6 +841,8 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -902,6 +922,8 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -981,6 +1003,8 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1060,6 +1084,8 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1139,6 +1165,8 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1218,6 +1246,8 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1297,6 +1327,8 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1376,6 +1408,8 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/mapsPubSubTypes.hpp b/test/dds-types-test/mapsPubSubTypes.hpp index 2a7662cf787..db82899c968 100644 --- a/test/dds-types-test/mapsPubSubTypes.hpp +++ b/test/dds-types-test/mapsPubSubTypes.hpp @@ -113,6 +113,8 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2325,6 +2381,8 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2404,6 +2462,8 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2483,6 +2543,8 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2562,6 +2624,8 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2641,6 +2705,8 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2720,6 +2786,8 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2799,6 +2867,8 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2878,6 +2948,8 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2957,6 +3029,8 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3036,6 +3110,8 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3115,6 +3191,8 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3194,6 +3272,8 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3273,6 +3353,8 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3352,6 +3434,8 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3431,6 +3515,8 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3510,6 +3596,8 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3589,6 +3677,8 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3668,6 +3758,8 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3747,6 +3839,8 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3826,6 +3920,8 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3905,6 +4001,8 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3984,6 +4082,8 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4063,6 +4163,8 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4142,6 +4244,8 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4221,6 +4325,8 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4300,6 +4406,8 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4379,6 +4487,8 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4458,6 +4568,8 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4537,6 +4649,8 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4616,6 +4730,8 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4695,6 +4811,8 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4774,6 +4892,8 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4853,6 +4973,8 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4932,6 +5054,8 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5011,6 +5135,8 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5090,6 +5216,8 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5169,6 +5297,8 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5248,6 +5378,8 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5327,6 +5459,8 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5406,6 +5540,8 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5485,6 +5621,8 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5564,6 +5702,8 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5643,6 +5783,8 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5722,6 +5864,8 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5801,6 +5945,8 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5880,6 +6026,8 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5959,6 +6107,8 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6038,6 +6188,8 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6117,6 +6269,8 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6196,6 +6350,8 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6275,6 +6431,8 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6354,6 +6512,8 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6433,6 +6593,8 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6512,6 +6674,8 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6591,6 +6755,8 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6670,6 +6836,8 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6749,6 +6917,8 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6828,6 +6998,8 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6907,6 +7079,8 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6986,6 +7160,8 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7065,6 +7241,8 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7144,6 +7322,8 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7223,6 +7403,8 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7302,6 +7484,8 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7381,6 +7565,8 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7460,6 +7646,8 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7539,6 +7727,8 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7618,6 +7808,8 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7697,6 +7889,8 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7776,6 +7970,8 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7855,6 +8051,8 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -7934,6 +8132,8 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8013,6 +8213,8 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8092,6 +8294,8 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8171,6 +8375,8 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8250,6 +8456,8 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8329,6 +8537,8 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8408,6 +8618,8 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8487,6 +8699,8 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8566,6 +8780,8 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8645,6 +8861,8 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8724,6 +8942,8 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8803,6 +9023,8 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8882,6 +9104,8 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -8961,6 +9185,8 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9040,6 +9266,8 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9119,6 +9347,8 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9198,6 +9428,8 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9277,6 +9509,8 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9356,6 +9590,8 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9435,6 +9671,8 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9514,6 +9752,8 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9593,6 +9833,8 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9672,6 +9914,8 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9751,6 +9995,8 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9830,6 +10076,8 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9909,6 +10157,8 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -9988,6 +10238,8 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10067,6 +10319,8 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10146,6 +10400,8 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10225,6 +10481,8 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10304,6 +10562,8 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10383,6 +10643,8 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10462,6 +10724,8 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10541,6 +10805,8 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10620,6 +10886,8 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10699,6 +10967,8 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10778,6 +11048,8 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10857,6 +11129,8 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -10936,6 +11210,8 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11015,6 +11291,8 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11094,6 +11372,8 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11173,6 +11453,8 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11252,6 +11534,8 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11331,6 +11615,8 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11410,6 +11696,8 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11489,6 +11777,8 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11568,6 +11858,8 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11647,6 +11939,8 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11726,6 +12020,8 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11805,6 +12101,8 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11884,6 +12182,8 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -11963,6 +12263,8 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12042,6 +12344,8 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12121,6 +12425,8 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12200,6 +12506,8 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12279,6 +12587,8 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12358,6 +12668,8 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12437,6 +12749,8 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12516,6 +12830,8 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12595,6 +12911,8 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12674,6 +12992,8 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12753,6 +13073,8 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12832,6 +13154,8 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12911,6 +13235,8 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -12990,6 +13316,8 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13069,6 +13397,8 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13148,6 +13478,8 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13227,6 +13559,8 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13306,6 +13640,8 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13385,6 +13721,8 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13464,6 +13802,8 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13543,6 +13883,8 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13622,6 +13964,8 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13701,6 +14045,8 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13780,6 +14126,8 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13859,6 +14207,8 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -13938,6 +14288,8 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14017,6 +14369,8 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14096,6 +14450,8 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14175,6 +14531,8 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14254,6 +14612,8 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14333,6 +14693,8 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14412,6 +14774,8 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14491,6 +14855,8 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14570,6 +14936,8 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14649,6 +15017,8 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14728,6 +15098,8 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14807,6 +15179,8 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14886,6 +15260,8 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -14965,6 +15341,8 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15044,6 +15422,8 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15123,6 +15503,8 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15202,6 +15584,8 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15281,6 +15665,8 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15360,6 +15746,8 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15439,6 +15827,8 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15518,6 +15908,8 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15597,6 +15989,8 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15676,6 +16070,8 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15755,6 +16151,8 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15834,6 +16232,8 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15913,6 +16313,8 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -15992,6 +16394,8 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16071,6 +16475,8 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16150,6 +16556,8 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16229,6 +16637,8 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16308,6 +16718,8 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16387,6 +16799,8 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16466,6 +16880,8 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16545,6 +16961,8 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16624,6 +17042,8 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16703,6 +17123,8 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16782,6 +17204,8 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16861,6 +17285,8 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -16940,6 +17366,8 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17019,6 +17447,8 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17098,6 +17528,8 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17177,6 +17609,8 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17256,6 +17690,8 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17335,6 +17771,8 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17414,6 +17852,8 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17493,6 +17933,8 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17572,6 +18014,8 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17651,6 +18095,8 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17730,6 +18176,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17809,6 +18257,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17888,6 +18338,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -17967,6 +18419,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18046,6 +18500,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18125,6 +18581,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18204,6 +18662,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18283,6 +18743,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18362,6 +18824,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18441,6 +18905,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18520,6 +18986,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18599,6 +19067,8 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18678,6 +19148,8 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18757,6 +19229,8 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18836,6 +19310,8 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18915,6 +19391,8 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -18994,6 +19472,8 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19073,6 +19553,8 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19152,6 +19634,8 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19231,6 +19715,8 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19310,6 +19796,8 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19389,6 +19877,8 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19468,6 +19958,8 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19547,6 +20039,8 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19626,6 +20120,8 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19705,6 +20201,8 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19784,6 +20282,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19863,6 +20363,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -19942,6 +20444,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20021,6 +20525,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20100,6 +20606,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20179,6 +20687,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20258,6 +20768,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20337,6 +20849,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20416,6 +20930,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20495,6 +21011,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20574,6 +21092,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20653,6 +21173,8 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -20732,6 +21254,8 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/member_idPubSubTypes.hpp b/test/dds-types-test/member_idPubSubTypes.hpp index f1bdd74ee18..4ab02678028 100644 --- a/test/dds-types-test/member_idPubSubTypes.hpp +++ b/test/dds-types-test/member_idPubSubTypes.hpp @@ -112,6 +112,8 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -349,6 +355,8 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -428,6 +436,8 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -507,6 +517,8 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -586,6 +598,8 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -665,6 +679,8 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -744,6 +760,8 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -823,6 +841,8 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -902,6 +922,8 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -981,6 +1003,8 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/mutablePubSubTypes.hpp b/test/dds-types-test/mutablePubSubTypes.hpp index 0210aeb75e4..d7c8411031d 100644 --- a/test/dds-types-test/mutablePubSubTypes.hpp +++ b/test/dds-types-test/mutablePubSubTypes.hpp @@ -113,6 +113,8 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/optionalPubSubTypes.hpp b/test/dds-types-test/optionalPubSubTypes.hpp index e3488d09480..ae477d9dd90 100644 --- a/test/dds-types-test/optionalPubSubTypes.hpp +++ b/test/dds-types-test/optionalPubSubTypes.hpp @@ -113,6 +113,8 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2325,6 +2381,8 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2404,6 +2462,8 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2483,6 +2543,8 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2562,6 +2624,8 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2641,6 +2705,8 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2720,6 +2786,8 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2799,6 +2867,8 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2878,6 +2948,8 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2957,6 +3029,8 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3036,6 +3110,8 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3115,6 +3191,8 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3194,6 +3272,8 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3273,6 +3353,8 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3352,6 +3434,8 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3431,6 +3515,8 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3510,6 +3596,8 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3589,6 +3677,8 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3668,6 +3758,8 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3747,6 +3839,8 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3826,6 +3920,8 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3905,6 +4001,8 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3984,6 +4082,8 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4063,6 +4163,8 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4142,6 +4244,8 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4221,6 +4325,8 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4300,6 +4406,8 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4379,6 +4487,8 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4458,6 +4568,8 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4537,6 +4649,8 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4616,6 +4730,8 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4695,6 +4811,8 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4774,6 +4892,8 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4853,6 +4973,8 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -4932,6 +5054,8 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5011,6 +5135,8 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5090,6 +5216,8 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5169,6 +5297,8 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5248,6 +5378,8 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5327,6 +5459,8 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5406,6 +5540,8 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5485,6 +5621,8 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5564,6 +5702,8 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5643,6 +5783,8 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5722,6 +5864,8 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5801,6 +5945,8 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5880,6 +6026,8 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -5959,6 +6107,8 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6038,6 +6188,8 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6117,6 +6269,8 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6196,6 +6350,8 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6275,6 +6431,8 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6354,6 +6512,8 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -6433,6 +6593,8 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/primitivesPubSubTypes.hpp b/test/dds-types-test/primitivesPubSubTypes.hpp index 5d67084dcd9..064216d2982 100644 --- a/test/dds-types-test/primitivesPubSubTypes.hpp +++ b/test/dds-types-test/primitivesPubSubTypes.hpp @@ -112,6 +112,8 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -349,6 +355,8 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -428,6 +436,8 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -507,6 +517,8 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -586,6 +598,8 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -665,6 +679,8 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -744,6 +760,8 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -823,6 +841,8 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -902,6 +922,8 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -981,6 +1003,8 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1060,6 +1084,8 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1139,6 +1165,8 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1218,6 +1246,8 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1297,6 +1327,8 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1376,6 +1408,8 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1455,6 +1489,8 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1534,6 +1570,8 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1613,6 +1651,8 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1692,6 +1732,8 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.hpp b/test/dds-types-test/relative_path_includePubSubTypes.hpp index 17eefabf029..95a3d1eeffd 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.hpp +++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp @@ -113,6 +113,8 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/sequencesPubSubTypes.hpp b/test/dds-types-test/sequencesPubSubTypes.hpp index 7692db289a8..983f16fd33a 100644 --- a/test/dds-types-test/sequencesPubSubTypes.hpp +++ b/test/dds-types-test/sequencesPubSubTypes.hpp @@ -113,6 +113,8 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/stringsPubSubTypes.hpp b/test/dds-types-test/stringsPubSubTypes.hpp index c2f6f265748..76bda9bdcca 100644 --- a/test/dds-types-test/stringsPubSubTypes.hpp +++ b/test/dds-types-test/stringsPubSubTypes.hpp @@ -112,6 +112,8 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -349,6 +355,8 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -428,6 +436,8 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -507,6 +517,8 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/structuresPubSubTypes.hpp b/test/dds-types-test/structuresPubSubTypes.hpp index 39e67020ed6..a68af1f1334 100644 --- a/test/dds-types-test/structuresPubSubTypes.hpp +++ b/test/dds-types-test/structuresPubSubTypes.hpp @@ -113,6 +113,8 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2327,6 +2383,8 @@ namespace testing_1 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2409,6 +2467,8 @@ namespace testing_2 #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE + private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2489,6 +2549,8 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2568,6 +2630,8 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2647,6 +2711,8 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2726,6 +2792,8 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/dds-types-test/unionsPubSubTypes.hpp b/test/dds-types-test/unionsPubSubTypes.hpp index a244eac9c6d..f4f03cfd3b7 100644 --- a/test/dds-types-test/unionsPubSubTypes.hpp +++ b/test/dds-types-test/unionsPubSubTypes.hpp @@ -113,6 +113,8 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -192,6 +194,8 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -271,6 +275,8 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -350,6 +356,8 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -429,6 +437,8 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -508,6 +518,8 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -587,6 +599,8 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -666,6 +680,8 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -745,6 +761,8 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -824,6 +842,8 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -903,6 +923,8 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -982,6 +1004,8 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1061,6 +1085,8 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1140,6 +1166,8 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1219,6 +1247,8 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1298,6 +1328,8 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1377,6 +1409,8 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1456,6 +1490,8 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1535,6 +1571,8 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1614,6 +1652,8 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1693,6 +1733,8 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1772,6 +1814,8 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1851,6 +1895,8 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -1930,6 +1976,8 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2009,6 +2057,8 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2088,6 +2138,8 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2167,6 +2219,8 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2246,6 +2300,8 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2325,6 +2381,8 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2404,6 +2462,8 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2483,6 +2543,8 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2562,6 +2624,8 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2641,6 +2705,8 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2720,6 +2786,8 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2799,6 +2867,8 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2878,6 +2948,8 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -2957,6 +3029,8 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3036,6 +3110,8 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3115,6 +3191,8 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3194,6 +3272,8 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -3273,6 +3353,8 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp index 640bffeb965..bccb5a14989 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.hpp +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp @@ -112,6 +112,8 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp index f17e9dc8c7d..fe817ca2f89 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp @@ -112,6 +112,8 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -193,6 +195,8 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp index 02f9a18f0be..8a24de83518 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/alias_struct/gen/alias_structPubSubTypes.hpp @@ -117,6 +117,8 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp index 5ff71513879..ea2758b2daa 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/array_struct/gen/array_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class NestedArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTyp #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class ComplexArrayElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class ArrayStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp index 28fb3956e0c..3748dcf031e 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitmask_struct/gen/bitmask_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class BitmaskStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp index 026cc4a8cd7..540f233b50e 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/bitset_struct/gen/bitset_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp index 230526e3af6..d8e06efaedd 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/enum_struct/gen/enum_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp index a89f7f7be05..0935ace0331 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/extensibility_struct/gen/extensibility_structPubSubTypes.hpp @@ -151,10 +151,11 @@ class FinalStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; -private: static constexpr bool is_plain_xcdrv1_impl() { @@ -246,6 +247,8 @@ class MutableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -325,6 +328,8 @@ class AppendableStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -404,6 +409,8 @@ class ExtensibilityStructPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp index 54c88de0b91..e57f9d039d9 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/key_struct/gen/key_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class ImportantStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class KeyStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp index 5f17e6aa287..0afc151f82a 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/map_struct/gen/map_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class ValueStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class MapStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp index ab3fa2fb39a..660b9e10916 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/primitives_struct/gen/primitives_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp index a349ba40e30..7b1156b7fe1 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/sequence_struct/gen/sequence_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class NestedSequenceElementPubSubType : public eprosima::fastdds::dds::TopicData #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class ComplexSequenceElementPubSubType : public eprosima::fastdds::dds::TopicDat #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class SequenceStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp index 64039ed2afc..f65d86f4c42 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/string_struct/gen/string_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp index d95a4de9966..23357a10840 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/struct_struct/gen/struct_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class GrandparentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -191,6 +193,8 @@ class ParentStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -270,6 +274,8 @@ class NestedStructElementPubSubType : public eprosima::fastdds::dds::TopicDataTy #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -349,6 +355,8 @@ class StructStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp index 4338f821c74..2e5e999e658 100644 --- a/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_structPubSubTypes.hpp @@ -112,6 +112,8 @@ class UnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; diff --git a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp index 7d60293617b..984eaf6935c 100644 --- a/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp +++ b/test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveTypePubSubTypes.hpp @@ -112,6 +112,8 @@ class PrimitivesStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -200,6 +202,8 @@ class AllStructPubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; @@ -279,6 +283,8 @@ class ComprehensiveTypePubSubType : public eprosima::fastdds::dds::TopicDataType #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE +private: + eprosima::fastdds::MD5 md5_; unsigned char* key_buffer_; From c04ae2900d67b27231f0fff3c1d26248f26b5a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Wed, 17 Jul 2024 15:04:51 +0200 Subject: [PATCH 13/14] Refs #21349. Fix doxygen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- include/fastdds/dds/topic/TopicDataType.hpp | 2 +- include/fastdds/dds/topic/TypeSupport.hpp | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 3e840578509..c27875a73da 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -126,7 +126,7 @@ class TopicDataType /** * Get the key associated with the data. * - * @param [in] data Pointer to the payload containing the data. + * @param [in] payload Pointer to the payload containing the data. * @param [out] ihandle Pointer to the Handle. * @param [in] force_md5 Force MD5 checking. * @return True if correct. diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index 9f3cf325eb0..94eff077b19 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -131,14 +131,6 @@ class TypeSupport : public std::shared_ptr return get()->get_name(); } - /** - * @brief Serializes the data - * - * @param data Pointer to data - * @param payload Pointer to payload - * @return true if it is serialized correctly, false if not - */ - /** * @brief Serializes the data * @@ -207,7 +199,7 @@ class TypeSupport : public std::shared_ptr * @return true if the key is returned, false if not */ FASTDDS_EXPORTED_API virtual bool compute_key( - void* data, + const void* const data, InstanceHandle_t& i_handle, bool force_md5 = false) { From b9bdb0453cbca99774c27e81b5c7d28892cd5390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Thu, 18 Jul 2024 07:56:06 +0200 Subject: [PATCH 14/14] Refs #21349. Regenerate source code after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- examples/cpp/flow_control/FlowControl.hpp | 4 ++- .../cpp/flow_control/FlowControlCdrAux.hpp | 1 + .../cpp/flow_control/FlowControlCdrAux.ipp | 1 + .../flow_control/FlowControlPubSubTypes.cxx | 32 +++++++++---------- .../flow_control/FlowControlPubSubTypes.hpp | 7 ++-- .../FlowControlTypeObjectSupport.hpp | 6 ++-- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/examples/cpp/flow_control/FlowControl.hpp b/examples/cpp/flow_control/FlowControl.hpp index 9a543be80fc..b77bb425968 100644 --- a/examples/cpp/flow_control/FlowControl.hpp +++ b/examples/cpp/flow_control/FlowControl.hpp @@ -221,4 +221,6 @@ class FlowControl }; -#endif // FAST_DDS_GENERATED__FLOWCONTROL_HPP +#endif // _FAST_DDS_GENERATED_FLOWCONTROL_HPP_ + + diff --git a/examples/cpp/flow_control/FlowControlCdrAux.hpp b/examples/cpp/flow_control/FlowControlCdrAux.hpp index 596b199d4c0..6526c6bd434 100644 --- a/examples/cpp/flow_control/FlowControlCdrAux.hpp +++ b/examples/cpp/flow_control/FlowControlCdrAux.hpp @@ -43,3 +43,4 @@ eProsima_user_DllExport void serialize_key( } // namespace eprosima #endif // FAST_DDS_GENERATED__FLOWCONTROLCDRAUX_HPP + diff --git a/examples/cpp/flow_control/FlowControlCdrAux.ipp b/examples/cpp/flow_control/FlowControlCdrAux.ipp index 481f6e2135f..6130cc70756 100644 --- a/examples/cpp/flow_control/FlowControlCdrAux.ipp +++ b/examples/cpp/flow_control/FlowControlCdrAux.ipp @@ -123,3 +123,4 @@ void serialize_key( } // namespace eprosima #endif // FAST_DDS_GENERATED__FLOWCONTROLCDRAUX_IPP + diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx index 1100f812674..f4681d8334e 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.cxx +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.cxx @@ -33,12 +33,12 @@ using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FlowControlPubSubType::FlowControlPubSubType() { - set_name("FlowControlExample"); - uint32_t type_size = FlowControlExample_max_cdr_typesize; + set_name("FlowControl"); + uint32_t type_size = FlowControl_max_cdr_typesize; type_size += static_cast(eprosima::fastcdr::Cdr::alignment(type_size, 4)); /* possible submessage alignment */ max_serialized_type_size = type_size + 4; /*encapsulation*/ is_compute_key_provided = false; - uint32_t key_length = FlowControlExample_max_key_cdr_typesize > 16 ? FlowControlExample_max_key_cdr_typesize : 16; + uint32_t key_length = FlowControl_max_key_cdr_typesize > 16 ? FlowControl_max_key_cdr_typesize : 16; key_buffer_ = reinterpret_cast(malloc(key_length)); memset(key_buffer_, 0, key_length); } @@ -87,7 +87,7 @@ bool FlowControlPubSubType::serialize( return true; } -bool FlowControlExamplePubSubType::deserialize( +bool FlowControlPubSubType::deserialize( SerializedPayload_t& payload, void* data) { @@ -117,7 +117,7 @@ bool FlowControlExamplePubSubType::deserialize( return true; } -uint32_t FlowControlExamplePubSubType::calculate_serialized_size( +uint32_t FlowControlPubSubType::calculate_serialized_size( const void* const data, DataRepresentationId_t data_representation) { @@ -128,8 +128,8 @@ uint32_t FlowControlExamplePubSubType::calculate_serialized_size( eprosima::fastcdr::CdrVersion::XCDRv1 :eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; return static_cast(calculator.calculate_serialized_size( - *static_cast(data), current_alignment)) + - 4u /*encapsulation*/; + *static_cast(data), current_alignment)) + + 4u /*encapsulation*/; } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -137,18 +137,18 @@ uint32_t FlowControlExamplePubSubType::calculate_serialized_size( } } -void* FlowControlExamplePubSubType::create_data() +void* FlowControlPubSubType::create_data() { return reinterpret_cast(new FlowControl()); } -void FlowControlExamplePubSubType::delete_data( +void FlowControlPubSubType::delete_data( void* data) { delete(reinterpret_cast(data)); } -bool FlowControlExamplePubSubType::compute_key( +bool FlowControlPubSubType::compute_key( SerializedPayload_t& payload, InstanceHandle_t& handle, bool force_md5) @@ -158,7 +158,7 @@ bool FlowControlExamplePubSubType::compute_key( return false; } - FlowControlExample data; + FlowControl data; if (deserialize(payload, static_cast(&data))) { return compute_key(static_cast(&data), handle, force_md5); @@ -167,7 +167,7 @@ bool FlowControlExamplePubSubType::compute_key( return false; } -bool FlowControlExamplePubSubType::compute_key( +bool FlowControlPubSubType::compute_key( const void* const data, InstanceHandle_t& handle, bool force_md5) @@ -181,13 +181,12 @@ bool FlowControlExamplePubSubType::compute_key( // Object that manages the raw buffer. eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(key_buffer_), - FlowControlExample_max_key_cdr_typesize); + FlowControl_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::XCDRv1); eprosima::fastcdr::serialize_key(ser, *p_type); - if (force_md5 || FlowControlExample_max_key_cdr_typesize > 16) + if (force_md5 || FlowControl_max_key_cdr_typesize > 16) { md5_.init(); md5_.update(key_buffer_, static_cast(ser.get_serialized_data_length())); @@ -212,5 +211,6 @@ void FlowControlPubSubType::register_type_object_representation() register_FlowControl_type_identifier(type_identifiers_); } + // Include auxiliary functions like for serializing/deserializing. #include "FlowControlCdrAux.ipp" diff --git a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp index 7e95a4c3268..8b3edb55737 100644 --- a/examples/cpp/flow_control/FlowControlPubSubTypes.hpp +++ b/examples/cpp/flow_control/FlowControlPubSubTypes.hpp @@ -13,13 +13,13 @@ // limitations under the License. /*! - - * @file FlowControlPubSubTypes.h + * @file FlowControlPubSubTypes.hpp * This header file contains the declaration of the serialization functions. * * This file was generated by the tool fastddsgen. */ + #ifndef FAST_DDS_GENERATED__FLOWCONTROL_PUBSUBTYPES_HPP #define FAST_DDS_GENERATED__FLOWCONTROL_PUBSUBTYPES_HPP @@ -34,7 +34,7 @@ #if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3) #error \ - Generated FlowControlExample is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. + Generated FlowControl is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // FASTDDS_GEN_API_VER @@ -120,3 +120,4 @@ class FlowControlPubSubType : public eprosima::fastdds::dds::TopicDataType }; #endif // FAST_DDS_GENERATED__FLOWCONTROL_PUBSUBTYPES_HPP + diff --git a/examples/cpp/flow_control/FlowControlTypeObjectSupport.hpp b/examples/cpp/flow_control/FlowControlTypeObjectSupport.hpp index c0ebc8c665d..338791494ce 100644 --- a/examples/cpp/flow_control/FlowControlTypeObjectSupport.hpp +++ b/examples/cpp/flow_control/FlowControlTypeObjectSupport.hpp @@ -19,8 +19,8 @@ * This file was generated by the tool fastddsgen. */ -#ifndef _FAST_DDS_GENERATED_FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP_ -#define _FAST_DDS_GENERATED_FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP_ +#ifndef FAST_DDS_GENERATED__FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP +#define FAST_DDS_GENERATED__FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP #include @@ -53,4 +53,4 @@ eProsima_user_DllExport void register_FlowControl_type_identifier( #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#endif // _FAST_DDS_GENERATED_FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP_ +#endif // FAST_DDS_GENERATED__FLOWCONTROL_TYPE_OBJECT_SUPPORT_HPP